diff --git a/README.md b/README.md index 8c77fd9..48f0366 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,38 @@ -[![Build Status](https://buildhive.cloudbees.com/job/andrena/job/no-package-cycles-enforcer-rule/badge/icon)](https://buildhive.cloudbees.com/job/andrena/job/no-package-cycles-enforcer-rule/) - -This Maven Enforcer Rule checks your project for package cycles. It fails the build if any package cycle is found, showing you the packages and classes involved in the cycle. - -Usage: Add the following plugin to your POM: - -``` - - maven-enforcer-plugin - 1.2 - - - de.andrena.tools.nopackagecycles - no-package-cycles-enforcer-rule - 1.0.4 - - - - - enforce-no-package-cycles - - enforce - - compile - - - - - - - - -``` - -See also: -* The original version by Daniel Seidewitz on [Stackoverflow](http://stackoverflow.com/questions/3416547/maven-jdepend-fail-build-with-cycles). Improved by showing all packages afflicted with cycles and the corresponding classes importing the conflicting packages. -* [JDepend](https://github.com/clarkware/jdepend), the library being used to detect package cycles. -* For more information about package cycles, see ["The Acyclic Dependencies Principle" by Robert C. Martin (Page 6)](http://www.objectmentor.com/resources/articles/granularity.pdf). +[![Build Status](https://buildhive.cloudbees.com/job/andrena/job/no-package-cycles-enforcer-rule/badge/icon)](https://buildhive.cloudbees.com/job/andrena/job/no-package-cycles-enforcer-rule/) + +This Maven Enforcer Rule checks your project for package cycles. It fails the build if any package cycle is found, showing you the packages and classes involved in the cycle. + +Usage: Add the following plugin to your POM: + +``` + + maven-enforcer-plugin + 1.2 + + + de.andrena.tools.nopackagecycles + no-package-cycles-enforcer-rule + 1.0.4 + + + + + enforce-no-package-cycles + + enforce + + test-compile + + + + + + + + +``` + +See also: +* The original version by Daniel Seidewitz on [Stackoverflow](http://stackoverflow.com/questions/3416547/maven-jdepend-fail-build-with-cycles). Improved by showing all packages afflicted with cycles and the corresponding classes importing the conflicting packages. +* [JDepend](https://github.com/clarkware/jdepend), the library being used to detect package cycles. +* For more information about package cycles, see ["The Acyclic Dependencies Principle" by Robert C. Martin (Page 6)](http://www.objectmentor.com/resources/articles/granularity.pdf). diff --git a/pom.xml b/pom.xml index 193420f..4de5f70 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,7 @@ **/*IntegrationTest.java + UTF-8 @@ -118,7 +119,7 @@ de.andrena.tools.nopackagecycles no-package-cycles-enforcer-rule - 1.0.3 + 1.0.4 @@ -194,7 +195,7 @@ test - org.apache.commons + commons-io commons-io 1.3.2 test diff --git a/src/main/java/de/andrena/tools/nopackagecycles/DirectoriesWithClasses.java b/src/main/java/de/andrena/tools/nopackagecycles/DirectoriesWithClasses.java new file mode 100644 index 0000000..29d5f24 --- /dev/null +++ b/src/main/java/de/andrena/tools/nopackagecycles/DirectoriesWithClasses.java @@ -0,0 +1,43 @@ +package de.andrena.tools.nopackagecycles; + +import static java.util.Collections.unmodifiableList; + +import java.io.File; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; +import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; + +public class DirectoriesWithClasses implements Iterable{ + + public static final String MAVEN_PROJECT_BUILD_OUTPUT_DIRECTORY_VAR = "${project.build.outputDirectory}"; + public static final String MAVEN_PROJECT_BUILD_TEST_OUTPUT_DIRECTORY_VAR = "${project.build.testOutputDirectory}"; + + private final List directories = new LinkedList(); + + public DirectoriesWithClasses(EnforcerRuleHelper helper) throws ExpressionEvaluationException { + addDirectoryIfExists(helper, MAVEN_PROJECT_BUILD_OUTPUT_DIRECTORY_VAR); + addDirectoryIfExists(helper, MAVEN_PROJECT_BUILD_TEST_OUTPUT_DIRECTORY_VAR); + } + + private void addDirectoryIfExists(EnforcerRuleHelper helper, String variable) + throws ExpressionEvaluationException { + File directory = new File((String) helper.evaluate(variable)); + if(directory.exists()) { + helper.getLog().info("Adding directory " + directory.getAbsolutePath() + " for package cycles search."); + directories.add(directory); + } else { + helper.getLog().info("Directory " + directory.getAbsolutePath() + " could not be found."); + } + } + + public boolean directoriesWithClassesFound() { + return !directories.isEmpty(); + } + + public Iterator iterator() { + return unmodifiableList(directories).iterator(); + } +} diff --git a/src/main/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRule.java b/src/main/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRule.java index 8a11c85..e49da77 100644 --- a/src/main/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRule.java +++ b/src/main/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRule.java @@ -1,77 +1,70 @@ -package de.andrena.tools.nopackagecycles; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; - -import jdepend.framework.JDepend; -import jdepend.framework.JavaPackage; - -import org.apache.maven.enforcer.rule.api.EnforcerRule; -import org.apache.maven.enforcer.rule.api.EnforcerRuleException; -import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; -import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; - -public class NoPackageCyclesRule implements EnforcerRule { - - public static final String MAVEN_CLASSES_DIR = "classes"; - public static final String MAVEN_PROJECT_BUILD_DIRECTORY_VAR = "${project.build.directory}"; - - public void execute(EnforcerRuleHelper helper) throws EnforcerRuleException { - try { - executePackageCycleCheckIfNecessary(helper); - } catch (ExpressionEvaluationException e) { - throw new EnforcerRuleException("Unable to lookup an expression " + e.getLocalizedMessage(), e); - } catch (IOException e) { - throw new EnforcerRuleException("Unable to access target directory " + e.getLocalizedMessage(), e); - } - } - - private void executePackageCycleCheckIfNecessary(EnforcerRuleHelper helper) throws ExpressionEvaluationException, - IOException, EnforcerRuleException { - File targetDir = new File((String) helper.evaluate(MAVEN_PROJECT_BUILD_DIRECTORY_VAR)); - File classesDir = new File(targetDir, MAVEN_CLASSES_DIR); - helper.getLog().info("Searching directory " + classesDir.getAbsolutePath() + " for package cycles."); - if (checkIsNecessary(classesDir)) { - executePackageCycleCheck(classesDir); - } else { - helper.getLog().info("Directory " + classesDir.getAbsolutePath() + " could not be found."); - } - } - - private void executePackageCycleCheck(File classesDir) throws IOException, EnforcerRuleException { - JDepend jdepend = createJDepend(); - jdepend.addDirectory(classesDir.getAbsolutePath()); - jdepend.analyze(); - if (jdepend.containsCycles()) { - throw new EnforcerRuleException("There are package cycles:" + getPackageCycles(jdepend)); - } - } - - protected JDepend createJDepend() { - return new JDepend(); - } - - private String getPackageCycles(JDepend jdepend) { - @SuppressWarnings("unchecked") - Collection packages = jdepend.getPackages(); - return new PackageCycleOutput(new ArrayList(packages)).getOutput(); - } - - private boolean checkIsNecessary(File classesDir) { - return classesDir.exists(); - } - - public String getCacheId() { - return ""; - } - - public boolean isCacheable() { - return false; - } - - public boolean isResultValid(EnforcerRule arg0) { - return false; - } +package de.andrena.tools.nopackagecycles; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; + +import jdepend.framework.JDepend; +import jdepend.framework.JavaPackage; + +import org.apache.maven.enforcer.rule.api.EnforcerRule; +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; +import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; + +public class NoPackageCyclesRule implements EnforcerRule { + + public void execute(EnforcerRuleHelper helper) throws EnforcerRuleException { + try { + executePackageCycleCheckIfNecessary(helper); + } catch (ExpressionEvaluationException e) { + throw new EnforcerRuleException("Unable to lookup an expression " + e.getLocalizedMessage(), e); + } catch (IOException e) { + throw new EnforcerRuleException("Unable to access target directory " + e.getLocalizedMessage(), e); + } + } + + private void executePackageCycleCheckIfNecessary(EnforcerRuleHelper helper) throws ExpressionEvaluationException, + IOException, EnforcerRuleException { + DirectoriesWithClasses directories = new DirectoriesWithClasses(helper); + if (directories.directoriesWithClassesFound()) { + executePackageCycleCheck(directories); + } else { + helper.getLog().info("No directories with classes to check for cycles found."); + } + } + + private void executePackageCycleCheck(Iterable directories) throws IOException, EnforcerRuleException { + JDepend jdepend = createJDepend(); + for (File directory : directories) { + jdepend.addDirectory(directory.getAbsolutePath()); + } + jdepend.analyze(); + if (jdepend.containsCycles()) { + throw new EnforcerRuleException("There are package cycles:" + getPackageCycles(jdepend)); + } + } + + protected JDepend createJDepend() { + return new JDepend(); + } + + private String getPackageCycles(JDepend jdepend) { + @SuppressWarnings("unchecked") + Collection packages = jdepend.getPackages(); + return new PackageCycleOutput(new ArrayList(packages)).getOutput(); + } + + public String getCacheId() { + return ""; + } + + public boolean isCacheable() { + return false; + } + + public boolean isResultValid(EnforcerRule arg0) { + return false; + } } \ No newline at end of file diff --git a/src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleIntegrationTest.java b/src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleIntegrationTest.java index 20b89de..fa8a978 100644 --- a/src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleIntegrationTest.java +++ b/src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleIntegrationTest.java @@ -11,9 +11,7 @@ import org.apache.commons.io.IOUtils; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import de.andrena.tools.nopackagecycles.mock.EnforcerRuleHelperMock; @@ -26,9 +24,6 @@ public class NoPackageCyclesRuleIntegrationTest { private NoPackageCyclesRule rule; private EnforcerRuleHelperMock helper; - @Rule - public ExpectedException expectedException = ExpectedException.none(); - @Before public void setUp() throws Exception { rule = new NoPackageCyclesRule(); @@ -46,7 +41,8 @@ public void junitIntegrationTest() throws Exception { } private void assertPackageCycles(URL targetFolder, URL expectedOutput) throws URISyntaxException, IOException { - helper.setTargetDir(new File(targetFolder.toURI())); + helper.setTestClassesDir(new File("non-existent")); + helper.setClassesDir(new File(targetFolder.toURI())); try { rule.execute(helper); fail("expected EnforcerRuleException"); diff --git a/src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleTest.java b/src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleTest.java index f2a00e8..175b9f5 100644 --- a/src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleTest.java +++ b/src/test/java/de/andrena/tools/nopackagecycles/NoPackageCyclesRuleTest.java @@ -43,9 +43,9 @@ protected JDepend createJDepend() { public void setUp() throws Exception { jdependMock = new JDependMock(); rule = new NoPackageCyclesRuleMock(); - temporaryFolder.newFolder(NoPackageCyclesRule.MAVEN_CLASSES_DIR); helper = new EnforcerRuleHelperMock(); - helper.setTargetDir(temporaryFolder.getRoot()); + helper.setClassesDir(temporaryFolder.newFolder("classes")); + helper.setTestClassesDir(temporaryFolder.newFolder("test-classes")); } @Test @@ -65,13 +65,16 @@ public void result_IsNotValid() { @Test public void execute_checkNotNecessary_ClassesDirNotFound() throws Exception { - File newFolder = temporaryFolder.newFolder(); - helper.setTargetDir(newFolder); + File nonExistentClassesFolder = new File(temporaryFolder.getRoot(), "non-existent-classes-dir"); + helper.setClassesDir(nonExistentClassesFolder); + File nonExistentTestClassesFolder = new File(temporaryFolder.getRoot(), "non-existent-test-classes-dir"); + helper.setTestClassesDir(nonExistentTestClassesFolder); rule.execute(helper); List infoLogs = helper.getLogMock().getInfo(); - assertThat(infoLogs, hasSize(2)); - assertSearchingInfo(newFolder, infoLogs); - assertThat(infoLogs.get(1), is("Directory " + getTargetDirectory(newFolder) + " could not be found.")); + assertThat(infoLogs, hasSize(3)); + assertThat(infoLogs.get(0), is("Directory " + nonExistentClassesFolder.getAbsolutePath() + " could not be found.")); + assertThat(infoLogs.get(1), is("Directory " + nonExistentTestClassesFolder.getAbsolutePath() + " could not be found.")); + assertThat(infoLogs.get(2), is("No directories with classes to check for cycles found.")); } @Test @@ -94,8 +97,20 @@ public void execute_JdependAddDirectoryFailed_ThrowsException() throws Exception public void execute_ContainsNoCycles() throws Exception { rule.execute(helper); List infoLogs = helper.getLogMock().getInfo(); - assertThat(infoLogs, hasSize(1)); - assertSearchingInfo(temporaryFolder.getRoot(), infoLogs); + assertThat(infoLogs, hasSize(2)); + assertThat(infoLogs.get(0), is("Adding directory " + new File(temporaryFolder.getRoot(), "classes").getAbsolutePath() + " for package cycles search.")); + assertThat(infoLogs.get(1), is("Adding directory " + new File(temporaryFolder.getRoot(), "test-classes").getAbsolutePath() + " for package cycles search.")); + } + + @Test + public void execute_ContainsNoCyclesWithoutTestClasses() throws Exception { + File nonExistentTestClassesDir = new File(temporaryFolder.getRoot(), "does not exist"); + helper.setTestClassesDir(nonExistentTestClassesDir); + rule.execute(helper); + List infoLogs = helper.getLogMock().getInfo(); + assertThat(infoLogs, hasSize(2)); + assertThat(infoLogs.get(0), is("Adding directory " + new File(temporaryFolder.getRoot(), "classes").getAbsolutePath() + " for package cycles search.")); + assertThat(infoLogs.get(1), is("Directory " + nonExistentTestClassesDir.getAbsolutePath() + " could not be found.")); } @Test @@ -105,13 +120,4 @@ public void execute_ContainsCycles() throws Exception { expectedException.expectMessage(containsString("There are package cycles")); rule.execute(helper); } - - private void assertSearchingInfo(File projectDirectory, List infoLogs) { - assertThat(infoLogs.get(0), is("Searching directory " + getTargetDirectory(projectDirectory) - + " for package cycles.")); - } - - private String getTargetDirectory(File newFolder) { - return new File(newFolder, NoPackageCyclesRule.MAVEN_CLASSES_DIR).getAbsolutePath(); - } } diff --git a/src/test/java/de/andrena/tools/nopackagecycles/mock/EnforcerRuleHelperMock.java b/src/test/java/de/andrena/tools/nopackagecycles/mock/EnforcerRuleHelperMock.java index 10a4f50..fb042e0 100644 --- a/src/test/java/de/andrena/tools/nopackagecycles/mock/EnforcerRuleHelperMock.java +++ b/src/test/java/de/andrena/tools/nopackagecycles/mock/EnforcerRuleHelperMock.java @@ -10,11 +10,12 @@ import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import de.andrena.tools.nopackagecycles.NoPackageCyclesRule; +import de.andrena.tools.nopackagecycles.DirectoriesWithClasses; public class EnforcerRuleHelperMock implements EnforcerRuleHelper { - private File targetDir; + private File classesDir; + private File testClassesDir; private boolean evaluateThrowsException; private final LogMock logMock = new LogMock(); @@ -26,10 +27,14 @@ public void setEvaluateThrowsException(boolean evaluateThrowsException) { this.evaluateThrowsException = evaluateThrowsException; } - public void setTargetDir(File targetDir) { - this.targetDir = targetDir; + public void setClassesDir(File targetDir) { + this.classesDir = targetDir; } + public void setTestClassesDir(File testClassesDir) { + this.testClassesDir = testClassesDir; + } + public File alignToBaseDirectory(File arg0) { return null; } @@ -38,8 +43,11 @@ public Object evaluate(String variable) throws ExpressionEvaluationException { if (evaluateThrowsException) { throw new ExpressionEvaluationException(""); } - if (NoPackageCyclesRule.MAVEN_PROJECT_BUILD_DIRECTORY_VAR.equals(variable)) { - return targetDir.getPath(); + if (DirectoriesWithClasses.MAVEN_PROJECT_BUILD_OUTPUT_DIRECTORY_VAR.equals(variable)) { + return classesDir.getPath(); + } + if (DirectoriesWithClasses.MAVEN_PROJECT_BUILD_TEST_OUTPUT_DIRECTORY_VAR.equals(variable)) { + return testClassesDir.getPath(); } return null; } diff --git a/src/test/resources/fitnesse-target/classes/META-INF/FitNesseVersion.txt b/src/test/resources/fitnesse-target/META-INF/FitNesseVersion.txt similarity index 100% rename from src/test/resources/fitnesse-target/classes/META-INF/FitNesseVersion.txt rename to src/test/resources/fitnesse-target/META-INF/FitNesseVersion.txt diff --git a/src/test/resources/fitnesse-target/classes/eg/Division.class b/src/test/resources/fitnesse-target/eg/Division.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/Division.class rename to src/test/resources/fitnesse-target/eg/Division.class diff --git a/src/test/resources/fitnesse-target/classes/eg/GetDates.class b/src/test/resources/fitnesse-target/eg/GetDates.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/GetDates.class rename to src/test/resources/fitnesse-target/eg/GetDates.class diff --git a/src/test/resources/fitnesse-target/classes/eg/bowling/Bowling.class b/src/test/resources/fitnesse-target/eg/bowling/Bowling.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/bowling/Bowling.class rename to src/test/resources/fitnesse-target/eg/bowling/Bowling.class diff --git a/src/test/resources/fitnesse-target/classes/eg/bowling/BowlingGame.class b/src/test/resources/fitnesse-target/eg/bowling/BowlingGame.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/bowling/BowlingGame.class rename to src/test/resources/fitnesse-target/eg/bowling/BowlingGame.class diff --git a/src/test/resources/fitnesse-target/classes/eg/bowling/BowlingGameTest.class b/src/test/resources/fitnesse-target/eg/bowling/BowlingGameTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/bowling/BowlingGameTest.class rename to src/test/resources/fitnesse-target/eg/bowling/BowlingGameTest.class diff --git a/src/test/resources/fitnesse-target/classes/eg/bowling/BowlingScorer.class b/src/test/resources/fitnesse-target/eg/bowling/BowlingScorer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/bowling/BowlingScorer.class rename to src/test/resources/fitnesse-target/eg/bowling/BowlingScorer.class diff --git a/src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/FinalScore.class b/src/test/resources/fitnesse-target/eg/bowling/fixtures/FinalScore.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/FinalScore.class rename to src/test/resources/fitnesse-target/eg/bowling/fixtures/FinalScore.class diff --git a/src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/GameTiming.class b/src/test/resources/fitnesse-target/eg/bowling/fixtures/GameTiming.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/GameTiming.class rename to src/test/resources/fitnesse-target/eg/bowling/fixtures/GameTiming.class diff --git a/src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/ScoreGame.class b/src/test/resources/fitnesse-target/eg/bowling/fixtures/ScoreGame.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/ScoreGame.class rename to src/test/resources/fitnesse-target/eg/bowling/fixtures/ScoreGame.class diff --git a/src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/ScoreGameTest.class b/src/test/resources/fitnesse-target/eg/bowling/fixtures/ScoreGameTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/ScoreGameTest.class rename to src/test/resources/fitnesse-target/eg/bowling/fixtures/ScoreGameTest.class diff --git a/src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/SimpleScoreGame.class b/src/test/resources/fitnesse-target/eg/bowling/fixtures/SimpleScoreGame.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/bowling/fixtures/SimpleScoreGame.class rename to src/test/resources/fitnesse-target/eg/bowling/fixtures/SimpleScoreGame.class diff --git a/src/test/resources/fitnesse-target/classes/eg/employeePayroll/Employees.class b/src/test/resources/fitnesse-target/eg/employeePayroll/Employees.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/employeePayroll/Employees.class rename to src/test/resources/fitnesse-target/eg/employeePayroll/Employees.class diff --git a/src/test/resources/fitnesse-target/classes/eg/employeePayroll/PayCheck.class b/src/test/resources/fitnesse-target/eg/employeePayroll/PayCheck.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/employeePayroll/PayCheck.class rename to src/test/resources/fitnesse-target/eg/employeePayroll/PayCheck.class diff --git a/src/test/resources/fitnesse-target/classes/eg/employeePayroll/PayDay.class b/src/test/resources/fitnesse-target/eg/employeePayroll/PayDay.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/employeePayroll/PayDay.class rename to src/test/resources/fitnesse-target/eg/employeePayroll/PayDay.class diff --git a/src/test/resources/fitnesse-target/classes/eg/employeePayroll/PaycheckInspector.class b/src/test/resources/fitnesse-target/eg/employeePayroll/PaycheckInspector.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/eg/employeePayroll/PaycheckInspector.class rename to src/test/resources/fitnesse-target/eg/employeePayroll/PaycheckInspector.class diff --git a/src/test/resources/fitnesse-target/classes/fit/ActionFixture.class b/src/test/resources/fitnesse-target/fit/ActionFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/ActionFixture.class rename to src/test/resources/fitnesse-target/fit/ActionFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Binding$NullBinding.class b/src/test/resources/fitnesse-target/fit/Binding$NullBinding.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Binding$NullBinding.class rename to src/test/resources/fitnesse-target/fit/Binding$NullBinding.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Binding$QueryBinding.class b/src/test/resources/fitnesse-target/fit/Binding$QueryBinding.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Binding$QueryBinding.class rename to src/test/resources/fitnesse-target/fit/Binding$QueryBinding.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Binding$RecallBinding.class b/src/test/resources/fitnesse-target/fit/Binding$RecallBinding.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Binding$RecallBinding.class rename to src/test/resources/fitnesse-target/fit/Binding$RecallBinding.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Binding$RegexQueryBinding.class b/src/test/resources/fitnesse-target/fit/Binding$RegexQueryBinding.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Binding$RegexQueryBinding.class rename to src/test/resources/fitnesse-target/fit/Binding$RegexQueryBinding.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Binding$SaveBinding.class b/src/test/resources/fitnesse-target/fit/Binding$SaveBinding.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Binding$SaveBinding.class rename to src/test/resources/fitnesse-target/fit/Binding$SaveBinding.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Binding$SetBinding.class b/src/test/resources/fitnesse-target/fit/Binding$SetBinding.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Binding$SetBinding.class rename to src/test/resources/fitnesse-target/fit/Binding$SetBinding.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Binding.class b/src/test/resources/fitnesse-target/fit/Binding.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Binding.class rename to src/test/resources/fitnesse-target/fit/Binding.class diff --git a/src/test/resources/fitnesse-target/classes/fit/BindingTest$ParentTestFixture.class b/src/test/resources/fitnesse-target/fit/BindingTest$ParentTestFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/BindingTest$ParentTestFixture.class rename to src/test/resources/fitnesse-target/fit/BindingTest$ParentTestFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/BindingTest$TestFixture.class b/src/test/resources/fitnesse-target/fit/BindingTest$TestFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/BindingTest$TestFixture.class rename to src/test/resources/fitnesse-target/fit/BindingTest$TestFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/BindingTest.class b/src/test/resources/fitnesse-target/fit/BindingTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/BindingTest.class rename to src/test/resources/fitnesse-target/fit/BindingTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/CannotLoadFixtureTest.class b/src/test/resources/fitnesse-target/fit/CannotLoadFixtureTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/CannotLoadFixtureTest.class rename to src/test/resources/fitnesse-target/fit/CannotLoadFixtureTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/ColumnFixture.class b/src/test/resources/fitnesse-target/fit/ColumnFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/ColumnFixture.class rename to src/test/resources/fitnesse-target/fit/ColumnFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/ColumnFixtureTest$TestFixture.class b/src/test/resources/fitnesse-target/fit/ColumnFixtureTest$TestFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/ColumnFixtureTest$TestFixture.class rename to src/test/resources/fitnesse-target/fit/ColumnFixtureTest$TestFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/ColumnFixtureTest.class b/src/test/resources/fitnesse-target/fit/ColumnFixtureTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/ColumnFixtureTest.class rename to src/test/resources/fitnesse-target/fit/ColumnFixtureTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Comment.class b/src/test/resources/fitnesse-target/fit/Comment.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Comment.class rename to src/test/resources/fitnesse-target/fit/Comment.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Counts.class b/src/test/resources/fitnesse-target/fit/Counts.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Counts.class rename to src/test/resources/fitnesse-target/fit/Counts.class diff --git a/src/test/resources/fitnesse-target/classes/fit/CountsTest.class b/src/test/resources/fitnesse-target/fit/CountsTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/CountsTest.class rename to src/test/resources/fitnesse-target/fit/CountsTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FileRunner.class b/src/test/resources/fitnesse-target/fit/FileRunner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FileRunner.class rename to src/test/resources/fitnesse-target/fit/FileRunner.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FitMatcher.class b/src/test/resources/fitnesse-target/fit/FitMatcher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FitMatcher.class rename to src/test/resources/fitnesse-target/fit/FitMatcher.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FitMatcherTest.class b/src/test/resources/fitnesse-target/fit/FitMatcherTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FitMatcherTest.class rename to src/test/resources/fitnesse-target/fit/FitMatcherTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FitProtocol.class b/src/test/resources/fitnesse-target/fit/FitProtocol.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FitProtocol.class rename to src/test/resources/fitnesse-target/fit/FitProtocol.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FitServer$TablePrintingFixtureListener.class b/src/test/resources/fitnesse-target/fit/FitServer$TablePrintingFixtureListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FitServer$TablePrintingFixtureListener.class rename to src/test/resources/fitnesse-target/fit/FitServer$TablePrintingFixtureListener.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FitServer.class b/src/test/resources/fitnesse-target/fit/FitServer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FitServer.class rename to src/test/resources/fitnesse-target/fit/FitServer.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FitServerTest$1.class b/src/test/resources/fitnesse-target/fit/FitServerTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FitServerTest$1.class rename to src/test/resources/fitnesse-target/fit/FitServerTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FitServerTest$2.class b/src/test/resources/fitnesse-target/fit/FitServerTest$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FitServerTest$2.class rename to src/test/resources/fitnesse-target/fit/FitServerTest$2.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FitServerTest.class b/src/test/resources/fitnesse-target/fit/FitServerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FitServerTest.class rename to src/test/resources/fitnesse-target/fit/FitServerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Fixture$1.class b/src/test/resources/fitnesse-target/fit/Fixture$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Fixture$1.class rename to src/test/resources/fitnesse-target/fit/Fixture$1.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Fixture$CellComparator.class b/src/test/resources/fitnesse-target/fit/Fixture$CellComparator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Fixture$CellComparator.class rename to src/test/resources/fitnesse-target/fit/Fixture$CellComparator.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Fixture$RunTime.class b/src/test/resources/fitnesse-target/fit/Fixture$RunTime.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Fixture$RunTime.class rename to src/test/resources/fitnesse-target/fit/Fixture$RunTime.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Fixture$Unparseable.class b/src/test/resources/fitnesse-target/fit/Fixture$Unparseable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Fixture$Unparseable.class rename to src/test/resources/fitnesse-target/fit/Fixture$Unparseable.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Fixture.class b/src/test/resources/fitnesse-target/fit/Fixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Fixture.class rename to src/test/resources/fitnesse-target/fit/Fixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureClass.class b/src/test/resources/fitnesse-target/fit/FixtureClass.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureClass.class rename to src/test/resources/fitnesse-target/fit/FixtureClass.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureListener.class b/src/test/resources/fitnesse-target/fit/FixtureListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureListener.class rename to src/test/resources/fitnesse-target/fit/FixtureListener.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureLoader$1.class b/src/test/resources/fitnesse-target/fit/FixtureLoader$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureLoader$1.class rename to src/test/resources/fitnesse-target/fit/FixtureLoader$1.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureLoader.class b/src/test/resources/fitnesse-target/fit/FixtureLoader.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureLoader.class rename to src/test/resources/fitnesse-target/fit/FixtureLoader.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureLoaderTest.class b/src/test/resources/fitnesse-target/fit/FixtureLoaderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureLoaderTest.class rename to src/test/resources/fitnesse-target/fit/FixtureLoaderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureName.class b/src/test/resources/fitnesse-target/fit/FixtureName.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureName.class rename to src/test/resources/fitnesse-target/fit/FixtureName.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureOne.class b/src/test/resources/fitnesse-target/fit/FixtureOne.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureOne.class rename to src/test/resources/fitnesse-target/fit/FixtureOne.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureSupplier.class b/src/test/resources/fitnesse-target/fit/FixtureSupplier.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureSupplier.class rename to src/test/resources/fitnesse-target/fit/FixtureSupplier.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureTest$1.class b/src/test/resources/fitnesse-target/fit/FixtureTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureTest$1.class rename to src/test/resources/fitnesse-target/fit/FixtureTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureTest$HasNoParseMethod.class b/src/test/resources/fitnesse-target/fit/FixtureTest$HasNoParseMethod.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureTest$HasNoParseMethod.class rename to src/test/resources/fitnesse-target/fit/FixtureTest$HasNoParseMethod.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureTest$HasParseMethod.class b/src/test/resources/fitnesse-target/fit/FixtureTest$HasParseMethod.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureTest$HasParseMethod.class rename to src/test/resources/fitnesse-target/fit/FixtureTest$HasParseMethod.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureTest.class b/src/test/resources/fitnesse-target/fit/FixtureTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureTest.class rename to src/test/resources/fitnesse-target/fit/FixtureTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FixtureTwo.class b/src/test/resources/fitnesse-target/fit/FixtureTwo.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FixtureTwo.class rename to src/test/resources/fitnesse-target/fit/FixtureTwo.class diff --git a/src/test/resources/fitnesse-target/classes/fit/FriendlyErrorTest.class b/src/test/resources/fitnesse-target/fit/FriendlyErrorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/FriendlyErrorTest.class rename to src/test/resources/fitnesse-target/fit/FriendlyErrorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/ImportFixture.class b/src/test/resources/fitnesse-target/fit/ImportFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/ImportFixture.class rename to src/test/resources/fitnesse-target/fit/ImportFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/NullFixtureListener.class b/src/test/resources/fitnesse-target/fit/NullFixtureListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/NullFixtureListener.class rename to src/test/resources/fitnesse-target/fit/NullFixtureListener.class diff --git a/src/test/resources/fitnesse-target/classes/fit/Parse.class b/src/test/resources/fitnesse-target/fit/Parse.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/Parse.class rename to src/test/resources/fitnesse-target/fit/Parse.class diff --git a/src/test/resources/fitnesse-target/classes/fit/ParseTest.class b/src/test/resources/fitnesse-target/fit/ParseTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/ParseTest.class rename to src/test/resources/fitnesse-target/fit/ParseTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/PrimitiveFixture.class b/src/test/resources/fitnesse-target/fit/PrimitiveFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/PrimitiveFixture.class rename to src/test/resources/fitnesse-target/fit/PrimitiveFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/RowFixture.class b/src/test/resources/fitnesse-target/fit/RowFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/RowFixture.class rename to src/test/resources/fitnesse-target/fit/RowFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$1.class b/src/test/resources/fitnesse-target/fit/RowFixtureTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$1.class rename to src/test/resources/fitnesse-target/fit/RowFixtureTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$BusinessObject.class b/src/test/resources/fitnesse-target/fit/RowFixtureTest$BusinessObject.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$BusinessObject.class rename to src/test/resources/fitnesse-target/fit/RowFixtureTest$BusinessObject.class diff --git a/src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$SimpleBusinessObject.class b/src/test/resources/fitnesse-target/fit/RowFixtureTest$SimpleBusinessObject.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$SimpleBusinessObject.class rename to src/test/resources/fitnesse-target/fit/RowFixtureTest$SimpleBusinessObject.class diff --git a/src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$SimpleRowFixture.class b/src/test/resources/fitnesse-target/fit/RowFixtureTest$SimpleRowFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$SimpleRowFixture.class rename to src/test/resources/fitnesse-target/fit/RowFixtureTest$SimpleRowFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$TestRowFixture.class b/src/test/resources/fitnesse-target/fit/RowFixtureTest$TestRowFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/RowFixtureTest$TestRowFixture.class rename to src/test/resources/fitnesse-target/fit/RowFixtureTest$TestRowFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/RowFixtureTest.class b/src/test/resources/fitnesse-target/fit/RowFixtureTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/RowFixtureTest.class rename to src/test/resources/fitnesse-target/fit/RowFixtureTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/ScientificDouble.class b/src/test/resources/fitnesse-target/fit/ScientificDouble.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/ScientificDouble.class rename to src/test/resources/fitnesse-target/fit/ScientificDouble.class diff --git a/src/test/resources/fitnesse-target/classes/fit/ScientificDoubleTest.class b/src/test/resources/fitnesse-target/fit/ScientificDoubleTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/ScientificDoubleTest.class rename to src/test/resources/fitnesse-target/fit/ScientificDoubleTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/SemaphoreFixture.class b/src/test/resources/fitnesse-target/fit/SemaphoreFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/SemaphoreFixture.class rename to src/test/resources/fitnesse-target/fit/SemaphoreFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/SummaryFixture.class b/src/test/resources/fitnesse-target/fit/SummaryFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/SummaryFixture.class rename to src/test/resources/fitnesse-target/fit/SummaryFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TheThirdFixture.class b/src/test/resources/fitnesse-target/fit/TheThirdFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TheThirdFixture.class rename to src/test/resources/fitnesse-target/fit/TheThirdFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TimedActionFixture.class b/src/test/resources/fitnesse-target/fit/TimedActionFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TimedActionFixture.class rename to src/test/resources/fitnesse-target/fit/TimedActionFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ArrayAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ArrayAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ArrayAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ArrayAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$BooleanAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$BooleanAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$BooleanAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$BooleanAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ByteAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ByteAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ByteAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ByteAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$CharAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$CharAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$CharAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$CharAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassBooleanAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ClassBooleanAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassBooleanAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ClassBooleanAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassByteAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ClassByteAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassByteAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ClassByteAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassCharacterAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ClassCharacterAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassCharacterAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ClassCharacterAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassDoubleAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ClassDoubleAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassDoubleAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ClassDoubleAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassFloatAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ClassFloatAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassFloatAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ClassFloatAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassIntegerAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ClassIntegerAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassIntegerAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ClassIntegerAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassLongAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ClassLongAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassLongAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ClassLongAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassShortAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ClassShortAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ClassShortAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ClassShortAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$DelegateClassAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$DelegateClassAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$DelegateClassAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$DelegateClassAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$DelegateObjectAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$DelegateObjectAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$DelegateObjectAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$DelegateObjectAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$DoubleAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$DoubleAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$DoubleAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$DoubleAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$FloatAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$FloatAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$FloatAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$FloatAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$IntAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$IntAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$IntAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$IntAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$LongAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$LongAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$LongAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$LongAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ShortAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter$ShortAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter$ShortAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter$ShortAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapter.class b/src/test/resources/fitnesse-target/fit/TypeAdapter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapter.class rename to src/test/resources/fitnesse-target/fit/TypeAdapter.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$DateFormater.class b/src/test/resources/fitnesse-target/fit/TypeAdapterTest$DateFormater.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$DateFormater.class rename to src/test/resources/fitnesse-target/fit/TypeAdapterTest$DateFormater.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$ProtectedParseMethod.class b/src/test/resources/fitnesse-target/fit/TypeAdapterTest$ProtectedParseMethod.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$ProtectedParseMethod.class rename to src/test/resources/fitnesse-target/fit/TypeAdapterTest$ProtectedParseMethod.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$PublicNonStaticParseMethod.class b/src/test/resources/fitnesse-target/fit/TypeAdapterTest$PublicNonStaticParseMethod.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$PublicNonStaticParseMethod.class rename to src/test/resources/fitnesse-target/fit/TypeAdapterTest$PublicNonStaticParseMethod.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$PublicStaticParseMethod.class b/src/test/resources/fitnesse-target/fit/TypeAdapterTest$PublicStaticParseMethod.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$PublicStaticParseMethod.class rename to src/test/resources/fitnesse-target/fit/TypeAdapterTest$PublicStaticParseMethod.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$PublicStaticParseMethodWithoutStringParam.class b/src/test/resources/fitnesse-target/fit/TypeAdapterTest$PublicStaticParseMethodWithoutStringParam.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$PublicStaticParseMethodWithoutStringParam.class rename to src/test/resources/fitnesse-target/fit/TypeAdapterTest$PublicStaticParseMethodWithoutStringParam.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$PublicStaticVoidParseMethod.class b/src/test/resources/fitnesse-target/fit/TypeAdapterTest$PublicStaticVoidParseMethod.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$PublicStaticVoidParseMethod.class rename to src/test/resources/fitnesse-target/fit/TypeAdapterTest$PublicStaticVoidParseMethod.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$TestFixture.class b/src/test/resources/fitnesse-target/fit/TypeAdapterTest$TestFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest$TestFixture.class rename to src/test/resources/fitnesse-target/fit/TypeAdapterTest$TestFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest.class b/src/test/resources/fitnesse-target/fit/TypeAdapterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/TypeAdapterTest.class rename to src/test/resources/fitnesse-target/fit/TypeAdapterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/WikiRunner.class b/src/test/resources/fitnesse-target/fit/WikiRunner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/WikiRunner.class rename to src/test/resources/fitnesse-target/fit/WikiRunner.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/CopyAndAppendLastRow.class b/src/test/resources/fitnesse-target/fit/decorator/CopyAndAppendLastRow.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/CopyAndAppendLastRow.class rename to src/test/resources/fitnesse-target/fit/decorator/CopyAndAppendLastRow.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/CopyAndAppendLastRowTest.class b/src/test/resources/fitnesse-target/fit/decorator/CopyAndAppendLastRowTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/CopyAndAppendLastRowTest.class rename to src/test/resources/fitnesse-target/fit/decorator/CopyAndAppendLastRowTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/FixtureDecorator.class b/src/test/resources/fitnesse-target/fit/decorator/FixtureDecorator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/FixtureDecorator.class rename to src/test/resources/fitnesse-target/fit/decorator/FixtureDecorator.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/FixtureDecoratorTestCase$1.class b/src/test/resources/fitnesse-target/fit/decorator/FixtureDecoratorTestCase$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/FixtureDecoratorTestCase$1.class rename to src/test/resources/fitnesse-target/fit/decorator/FixtureDecoratorTestCase$1.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/FixtureDecoratorTestCase$2.class b/src/test/resources/fitnesse-target/fit/decorator/FixtureDecoratorTestCase$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/FixtureDecoratorTestCase$2.class rename to src/test/resources/fitnesse-target/fit/decorator/FixtureDecoratorTestCase$2.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/FixtureDecoratorTestCase.class b/src/test/resources/fitnesse-target/fit/decorator/FixtureDecoratorTestCase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/FixtureDecoratorTestCase.class rename to src/test/resources/fitnesse-target/fit/decorator/FixtureDecoratorTestCase.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/IncrementColumnsValue.class b/src/test/resources/fitnesse-target/fit/decorator/IncrementColumnsValue.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/IncrementColumnsValue.class rename to src/test/resources/fitnesse-target/fit/decorator/IncrementColumnsValue.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/IncrementColumnsValueTest.class b/src/test/resources/fitnesse-target/fit/decorator/IncrementColumnsValueTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/IncrementColumnsValueTest.class rename to src/test/resources/fitnesse-target/fit/decorator/IncrementColumnsValueTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/Loop.class b/src/test/resources/fitnesse-target/fit/decorator/Loop.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/Loop.class rename to src/test/resources/fitnesse-target/fit/decorator/Loop.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/LoopTest.class b/src/test/resources/fitnesse-target/fit/decorator/LoopTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/LoopTest.class rename to src/test/resources/fitnesse-target/fit/decorator/LoopTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/TestFixture.class b/src/test/resources/fitnesse-target/fit/decorator/TestFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/TestFixture.class rename to src/test/resources/fitnesse-target/fit/decorator/TestFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/exceptions/InvalidInputException.class b/src/test/resources/fitnesse-target/fit/decorator/exceptions/InvalidInputException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/exceptions/InvalidInputException.class rename to src/test/resources/fitnesse-target/fit/decorator/exceptions/InvalidInputException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/performance/MaxTime.class b/src/test/resources/fitnesse-target/fit/decorator/performance/MaxTime.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/performance/MaxTime.class rename to src/test/resources/fitnesse-target/fit/decorator/performance/MaxTime.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/performance/MaxTimeTest.class b/src/test/resources/fitnesse-target/fit/decorator/performance/MaxTimeTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/performance/MaxTimeTest.class rename to src/test/resources/fitnesse-target/fit/decorator/performance/MaxTimeTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/performance/TimeBasedFixtureDecorator.class b/src/test/resources/fitnesse-target/fit/decorator/performance/TimeBasedFixtureDecorator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/performance/TimeBasedFixtureDecorator.class rename to src/test/resources/fitnesse-target/fit/decorator/performance/TimeBasedFixtureDecorator.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/performance/TimeRange.class b/src/test/resources/fitnesse-target/fit/decorator/performance/TimeRange.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/performance/TimeRange.class rename to src/test/resources/fitnesse-target/fit/decorator/performance/TimeRange.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/performance/TimeRangeTest.class b/src/test/resources/fitnesse-target/fit/decorator/performance/TimeRangeTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/performance/TimeRangeTest.class rename to src/test/resources/fitnesse-target/fit/decorator/performance/TimeRangeTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/ClassDelegatePointParser.class b/src/test/resources/fitnesse-target/fit/decorator/util/ClassDelegatePointParser.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/ClassDelegatePointParser.class rename to src/test/resources/fitnesse-target/fit/decorator/util/ClassDelegatePointParser.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/ClassDelegatePointParserTest.class b/src/test/resources/fitnesse-target/fit/decorator/util/ClassDelegatePointParserTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/ClassDelegatePointParserTest.class rename to src/test/resources/fitnesse-target/fit/decorator/util/ClassDelegatePointParserTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType$1.class b/src/test/resources/fitnesse-target/fit/decorator/util/DataType$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType$1.class rename to src/test/resources/fitnesse-target/fit/decorator/util/DataType$1.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType$2.class b/src/test/resources/fitnesse-target/fit/decorator/util/DataType$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType$2.class rename to src/test/resources/fitnesse-target/fit/decorator/util/DataType$2.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType$3.class b/src/test/resources/fitnesse-target/fit/decorator/util/DataType$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType$3.class rename to src/test/resources/fitnesse-target/fit/decorator/util/DataType$3.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType$4.class b/src/test/resources/fitnesse-target/fit/decorator/util/DataType$4.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType$4.class rename to src/test/resources/fitnesse-target/fit/decorator/util/DataType$4.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType.class b/src/test/resources/fitnesse-target/fit/decorator/util/DataType.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/DataType.class rename to src/test/resources/fitnesse-target/fit/decorator/util/DataType.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/DataTypeTest.class b/src/test/resources/fitnesse-target/fit/decorator/util/DataTypeTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/DataTypeTest.class rename to src/test/resources/fitnesse-target/fit/decorator/util/DataTypeTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/DefaultTimer.class b/src/test/resources/fitnesse-target/fit/decorator/util/DefaultTimer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/DefaultTimer.class rename to src/test/resources/fitnesse-target/fit/decorator/util/DefaultTimer.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/Delta.class b/src/test/resources/fitnesse-target/fit/decorator/util/Delta.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/Delta.class rename to src/test/resources/fitnesse-target/fit/decorator/util/Delta.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/DeltaTest$1.class b/src/test/resources/fitnesse-target/fit/decorator/util/DeltaTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/DeltaTest$1.class rename to src/test/resources/fitnesse-target/fit/decorator/util/DeltaTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/DeltaTest.class b/src/test/resources/fitnesse-target/fit/decorator/util/DeltaTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/DeltaTest.class rename to src/test/resources/fitnesse-target/fit/decorator/util/DeltaTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/PointDataType.class b/src/test/resources/fitnesse-target/fit/decorator/util/PointDataType.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/PointDataType.class rename to src/test/resources/fitnesse-target/fit/decorator/util/PointDataType.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/Table.class b/src/test/resources/fitnesse-target/fit/decorator/util/Table.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/Table.class rename to src/test/resources/fitnesse-target/fit/decorator/util/Table.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/TableTest.class b/src/test/resources/fitnesse-target/fit/decorator/util/TableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/TableTest.class rename to src/test/resources/fitnesse-target/fit/decorator/util/TableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/TestCaseHelper.class b/src/test/resources/fitnesse-target/fit/decorator/util/TestCaseHelper.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/TestCaseHelper.class rename to src/test/resources/fitnesse-target/fit/decorator/util/TestCaseHelper.class diff --git a/src/test/resources/fitnesse-target/classes/fit/decorator/util/Timer.class b/src/test/resources/fitnesse-target/fit/decorator/util/Timer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/decorator/util/Timer.class rename to src/test/resources/fitnesse-target/fit/decorator/util/Timer.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/ClassIsNotFixtureException.class b/src/test/resources/fitnesse-target/fit/exception/ClassIsNotFixtureException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/ClassIsNotFixtureException.class rename to src/test/resources/fitnesse-target/fit/exception/ClassIsNotFixtureException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/CouldNotLoadComponentFitFailureException.class b/src/test/resources/fitnesse-target/fit/exception/CouldNotLoadComponentFitFailureException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/CouldNotLoadComponentFitFailureException.class rename to src/test/resources/fitnesse-target/fit/exception/CouldNotLoadComponentFitFailureException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/CouldNotParseFitFailureException.class b/src/test/resources/fitnesse-target/fit/exception/CouldNotParseFitFailureException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/CouldNotParseFitFailureException.class rename to src/test/resources/fitnesse-target/fit/exception/CouldNotParseFitFailureException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/FitFailureException.class b/src/test/resources/fitnesse-target/fit/exception/FitFailureException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/FitFailureException.class rename to src/test/resources/fitnesse-target/fit/exception/FitFailureException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/FitMatcherException.class b/src/test/resources/fitnesse-target/fit/exception/FitMatcherException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/FitMatcherException.class rename to src/test/resources/fitnesse-target/fit/exception/FitMatcherException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/FitParseException.class b/src/test/resources/fitnesse-target/fit/exception/FitParseException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/FitParseException.class rename to src/test/resources/fitnesse-target/fit/exception/FitParseException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/FixtureException.class b/src/test/resources/fitnesse-target/fit/exception/FixtureException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/FixtureException.class rename to src/test/resources/fitnesse-target/fit/exception/FixtureException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/NoDefaultConstructorFixtureException.class b/src/test/resources/fitnesse-target/fit/exception/NoDefaultConstructorFixtureException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/NoDefaultConstructorFixtureException.class rename to src/test/resources/fitnesse-target/fit/exception/NoDefaultConstructorFixtureException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/NoSuchFieldFitFailureException.class b/src/test/resources/fitnesse-target/fit/exception/NoSuchFieldFitFailureException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/NoSuchFieldFitFailureException.class rename to src/test/resources/fitnesse-target/fit/exception/NoSuchFieldFitFailureException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/NoSuchFixtureException.class b/src/test/resources/fitnesse-target/fit/exception/NoSuchFixtureException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/NoSuchFixtureException.class rename to src/test/resources/fitnesse-target/fit/exception/NoSuchFixtureException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/exception/NoSuchMethodFitFailureException.class b/src/test/resources/fitnesse-target/fit/exception/NoSuchMethodFitFailureException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/exception/NoSuchMethodFitFailureException.class rename to src/test/resources/fitnesse-target/fit/exception/NoSuchMethodFitFailureException.class diff --git a/src/test/resources/fitnesse-target/classes/fit/testFxtr/HandleFixtureDoesNotExtendFixtureTest.class b/src/test/resources/fitnesse-target/fit/testFxtr/HandleFixtureDoesNotExtendFixtureTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/testFxtr/HandleFixtureDoesNotExtendFixtureTest.class rename to src/test/resources/fitnesse-target/fit/testFxtr/HandleFixtureDoesNotExtendFixtureTest.class diff --git a/src/test/resources/fitnesse-target/classes/fit/testFxtr/NoDefaultConstructorFixture.class b/src/test/resources/fitnesse-target/fit/testFxtr/NoDefaultConstructorFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/testFxtr/NoDefaultConstructorFixture.class rename to src/test/resources/fitnesse-target/fit/testFxtr/NoDefaultConstructorFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fit/testFxtr/WouldBeFixture.class b/src/test/resources/fitnesse-target/fit/testFxtr/WouldBeFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fit/testFxtr/WouldBeFixture.class rename to src/test/resources/fitnesse-target/fit/testFxtr/WouldBeFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/Arguments.class b/src/test/resources/fitnesse-target/fitnesse/Arguments.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/Arguments.class rename to src/test/resources/fitnesse-target/fitnesse/Arguments.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactory.class b/src/test/resources/fitnesse-target/fitnesse/ComponentFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactory.class rename to src/test/resources/fitnesse-target/fitnesse/ComponentFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactoryTest$DummyPlugin.class b/src/test/resources/fitnesse-target/fitnesse/ComponentFactoryTest$DummyPlugin.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactoryTest$DummyPlugin.class rename to src/test/resources/fitnesse-target/fitnesse/ComponentFactoryTest$DummyPlugin.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactoryTest$TestContentFilter.class b/src/test/resources/fitnesse-target/fitnesse/ComponentFactoryTest$TestContentFilter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactoryTest$TestContentFilter.class rename to src/test/resources/fitnesse-target/fitnesse/ComponentFactoryTest$TestContentFilter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactoryTest$TestSlimTable.class b/src/test/resources/fitnesse-target/fitnesse/ComponentFactoryTest$TestSlimTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactoryTest$TestSlimTable.class rename to src/test/resources/fitnesse-target/fitnesse/ComponentFactoryTest$TestSlimTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactoryTest.class b/src/test/resources/fitnesse-target/fitnesse/ComponentFactoryTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/ComponentFactoryTest.class rename to src/test/resources/fitnesse-target/fitnesse/ComponentFactoryTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitFilter.class b/src/test/resources/fitnesse-target/fitnesse/FitFilter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitFilter.class rename to src/test/resources/fitnesse-target/fitnesse/FitFilter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesse.class b/src/test/resources/fitnesse-target/fitnesse/FitNesse.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesse.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesse.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseContext$1.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseContext$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseContext$1.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseContext$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseContext$Builder.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseContext$Builder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseContext$Builder.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseContext$Builder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseContext.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseContext.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseContext.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseContext.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseContextTest.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseContextTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseContextTest.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseContextTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediter$1.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseExpediter$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediter$1.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseExpediter$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediter.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseExpediter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediter.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseExpediter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediterTest$1.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseExpediterTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediterTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseExpediterTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediterTest$2.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseExpediterTest$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediterTest$2.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseExpediterTest$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediterTest$StoneWallAuthenticator.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseExpediterTest$StoneWallAuthenticator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediterTest$StoneWallAuthenticator.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseExpediterTest$StoneWallAuthenticator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediterTest.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseExpediterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseExpediterTest.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseExpediterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseServer.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseServer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseServer.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseServer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseServerTest.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseServerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseServerTest.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseServerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseVersion.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseVersion.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseVersion.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseVersion.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/FitNesseVersionTest.class b/src/test/resources/fitnesse-target/fitnesse/FitNesseVersionTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/FitNesseVersionTest.class rename to src/test/resources/fitnesse-target/fitnesse/FitNesseVersionTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/Responder.class b/src/test/resources/fitnesse-target/fitnesse/Responder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/Responder.class rename to src/test/resources/fitnesse-target/fitnesse/Responder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/Shutdown.class b/src/test/resources/fitnesse-target/fitnesse/Shutdown.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/Shutdown.class rename to src/test/resources/fitnesse-target/fitnesse/Shutdown.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/ShutdownTest.class b/src/test/resources/fitnesse-target/fitnesse/ShutdownTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/ShutdownTest.class rename to src/test/resources/fitnesse-target/fitnesse/ShutdownTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/Updater.class b/src/test/resources/fitnesse-target/fitnesse/Updater.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/Updater.class rename to src/test/resources/fitnesse-target/fitnesse/Updater.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/WikiPageFactory.class b/src/test/resources/fitnesse-target/fitnesse/WikiPageFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/WikiPageFactory.class rename to src/test/resources/fitnesse-target/fitnesse/WikiPageFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/AlwaysSecureOperation.class b/src/test/resources/fitnesse-target/fitnesse/authentication/AlwaysSecureOperation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/AlwaysSecureOperation.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/AlwaysSecureOperation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/Authenticator.class b/src/test/resources/fitnesse-target/fitnesse/authentication/Authenticator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/Authenticator.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/Authenticator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/AuthenticatorTest$DummySecureResponder.class b/src/test/resources/fitnesse-target/fitnesse/authentication/AuthenticatorTest$DummySecureResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/AuthenticatorTest$DummySecureResponder.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/AuthenticatorTest$DummySecureResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/AuthenticatorTest.class b/src/test/resources/fitnesse-target/fitnesse/authentication/AuthenticatorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/AuthenticatorTest.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/AuthenticatorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/HashingCipher.class b/src/test/resources/fitnesse-target/fitnesse/authentication/HashingCipher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/HashingCipher.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/HashingCipher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/HashingCipherTest.class b/src/test/resources/fitnesse-target/fitnesse/authentication/HashingCipherTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/HashingCipherTest.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/HashingCipherTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/InsecureOperation.class b/src/test/resources/fitnesse-target/fitnesse/authentication/InsecureOperation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/InsecureOperation.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/InsecureOperation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/MultiUserAuthenticator.class b/src/test/resources/fitnesse-target/fitnesse/authentication/MultiUserAuthenticator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/MultiUserAuthenticator.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/MultiUserAuthenticator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/MultiUserAuthenticatorTest.class b/src/test/resources/fitnesse-target/fitnesse/authentication/MultiUserAuthenticatorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/MultiUserAuthenticatorTest.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/MultiUserAuthenticatorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/NegotiateAuthenticator$UnauthenticatedNegotiateResponder.class b/src/test/resources/fitnesse-target/fitnesse/authentication/NegotiateAuthenticator$UnauthenticatedNegotiateResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/NegotiateAuthenticator$UnauthenticatedNegotiateResponder.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/NegotiateAuthenticator$UnauthenticatedNegotiateResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/NegotiateAuthenticator.class b/src/test/resources/fitnesse-target/fitnesse/authentication/NegotiateAuthenticator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/NegotiateAuthenticator.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/NegotiateAuthenticator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/NegotiateAuthenticatorTest.class b/src/test/resources/fitnesse-target/fitnesse/authentication/NegotiateAuthenticatorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/NegotiateAuthenticatorTest.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/NegotiateAuthenticatorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/OneUserAuthenticator.class b/src/test/resources/fitnesse-target/fitnesse/authentication/OneUserAuthenticator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/OneUserAuthenticator.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/OneUserAuthenticator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/Password.class b/src/test/resources/fitnesse-target/fitnesse/authentication/Password.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/Password.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/Password.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/PasswordCipher.class b/src/test/resources/fitnesse-target/fitnesse/authentication/PasswordCipher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/PasswordCipher.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/PasswordCipher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/PasswordFile.class b/src/test/resources/fitnesse-target/fitnesse/authentication/PasswordFile.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/PasswordFile.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/PasswordFile.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/PasswordFileTest.class b/src/test/resources/fitnesse-target/fitnesse/authentication/PasswordFileTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/PasswordFileTest.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/PasswordFileTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/PasswordTest.class b/src/test/resources/fitnesse-target/fitnesse/authentication/PasswordTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/PasswordTest.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/PasswordTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/PromiscuousAuthenticator.class b/src/test/resources/fitnesse-target/fitnesse/authentication/PromiscuousAuthenticator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/PromiscuousAuthenticator.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/PromiscuousAuthenticator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureOperation.class b/src/test/resources/fitnesse-target/fitnesse/authentication/SecureOperation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureOperation.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/SecureOperation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureOperationTest.class b/src/test/resources/fitnesse-target/fitnesse/authentication/SecureOperationTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureOperationTest.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/SecureOperationTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecurePageOperation.class b/src/test/resources/fitnesse-target/fitnesse/authentication/SecurePageOperation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecurePageOperation.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/SecurePageOperation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureReadOperation.class b/src/test/resources/fitnesse-target/fitnesse/authentication/SecureReadOperation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureReadOperation.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/SecureReadOperation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureResponder.class b/src/test/resources/fitnesse-target/fitnesse/authentication/SecureResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureResponder.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/SecureResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureTestOperation.class b/src/test/resources/fitnesse-target/fitnesse/authentication/SecureTestOperation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureTestOperation.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/SecureTestOperation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureWriteOperation.class b/src/test/resources/fitnesse-target/fitnesse/authentication/SecureWriteOperation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/SecureWriteOperation.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/SecureWriteOperation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/TransparentCipher.class b/src/test/resources/fitnesse-target/fitnesse/authentication/TransparentCipher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/TransparentCipher.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/TransparentCipher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/UnauthorizedResponder.class b/src/test/resources/fitnesse-target/fitnesse/authentication/UnauthorizedResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/UnauthorizedResponder.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/UnauthorizedResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/authentication/UnauthorizedResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/authentication/UnauthorizedResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/authentication/UnauthorizedResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/authentication/UnauthorizedResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/AndPageFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/AndPageFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/AndPageFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/AndPageFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/AndPageFinderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/AndPageFinderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/AndPageFinderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/AndPageFinderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/AttributeWikiPageFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/AttributeWikiPageFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/AttributeWikiPageFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/AttributeWikiPageFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/AttributeWikiPageFinderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/AttributeWikiPageFinderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/AttributeWikiPageFinderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/AttributeWikiPageFinderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/ClassPathBuilder.class b/src/test/resources/fitnesse-target/fitnesse/components/ClassPathBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/ClassPathBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/components/ClassPathBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/ClassPathBuilderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/ClassPathBuilderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/ClassPathBuilderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/ClassPathBuilderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/CompositePageFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/CompositePageFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/CompositePageFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/CompositePageFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/CompositePageFinderTestCase.class b/src/test/resources/fitnesse-target/fitnesse/components/CompositePageFinderTestCase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/CompositePageFinderTestCase.class rename to src/test/resources/fitnesse-target/fitnesse/components/CompositePageFinderTestCase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/ContentBuffer$1.class b/src/test/resources/fitnesse-target/fitnesse/components/ContentBuffer$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/ContentBuffer$1.class rename to src/test/resources/fitnesse-target/fitnesse/components/ContentBuffer$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/ContentBuffer.class b/src/test/resources/fitnesse-target/fitnesse/components/ContentBuffer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/ContentBuffer.class rename to src/test/resources/fitnesse-target/fitnesse/components/ContentBuffer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/ContentBufferTest.class b/src/test/resources/fitnesse-target/fitnesse/components/ContentBufferTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/ContentBufferTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/ContentBufferTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/ContentReplacingSearchObserver.class b/src/test/resources/fitnesse-target/fitnesse/components/ContentReplacingSearchObserver.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/ContentReplacingSearchObserver.class rename to src/test/resources/fitnesse-target/fitnesse/components/ContentReplacingSearchObserver.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/ContentReplacingSearchObserverTest$1.class b/src/test/resources/fitnesse-target/fitnesse/components/ContentReplacingSearchObserverTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/ContentReplacingSearchObserverTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/components/ContentReplacingSearchObserverTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/ContentReplacingSearchObserverTest.class b/src/test/resources/fitnesse-target/fitnesse/components/ContentReplacingSearchObserverTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/ContentReplacingSearchObserverTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/ContentReplacingSearchObserverTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/LogData.class b/src/test/resources/fitnesse-target/fitnesse/components/LogData.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/LogData.class rename to src/test/resources/fitnesse-target/fitnesse/components/LogData.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/Logger.class b/src/test/resources/fitnesse-target/fitnesse/components/Logger.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/Logger.class rename to src/test/resources/fitnesse-target/fitnesse/components/Logger.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/LoggerTest.class b/src/test/resources/fitnesse-target/fitnesse/components/LoggerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/LoggerTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/LoggerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/MovedPageReferenceRenamer.class b/src/test/resources/fitnesse-target/fitnesse/components/MovedPageReferenceRenamer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/MovedPageReferenceRenamer.class rename to src/test/resources/fitnesse-target/fitnesse/components/MovedPageReferenceRenamer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/OrPageFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/OrPageFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/OrPageFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/OrPageFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/OrPageFinderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/OrPageFinderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/OrPageFinderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/OrPageFinderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/PageFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/PageFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/PageFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/PageFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/PageReferenceRenamer.class b/src/test/resources/fitnesse-target/fitnesse/components/PageReferenceRenamer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/PageReferenceRenamer.class rename to src/test/resources/fitnesse-target/fitnesse/components/PageReferenceRenamer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/PageReferenceRenamerTest.class b/src/test/resources/fitnesse-target/fitnesse/components/PageReferenceRenamerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/PageReferenceRenamerTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/PageReferenceRenamerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/PageReferencer.class b/src/test/resources/fitnesse-target/fitnesse/components/PageReferencer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/PageReferencer.class rename to src/test/resources/fitnesse-target/fitnesse/components/PageReferencer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/PluginsClassLoader.class b/src/test/resources/fitnesse-target/fitnesse/components/PluginsClassLoader.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/PluginsClassLoader.class rename to src/test/resources/fitnesse-target/fitnesse/components/PluginsClassLoader.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/PluginsClassLoaderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/PluginsClassLoaderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/PluginsClassLoaderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/PluginsClassLoaderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/RecentChanges.class b/src/test/resources/fitnesse-target/fitnesse/components/RecentChanges.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/RecentChanges.class rename to src/test/resources/fitnesse-target/fitnesse/components/RecentChanges.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/RecentChangesTest.class b/src/test/resources/fitnesse-target/fitnesse/components/RecentChangesTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/RecentChangesTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/RecentChangesTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/ReferenceRenamer.class b/src/test/resources/fitnesse-target/fitnesse/components/ReferenceRenamer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/ReferenceRenamer.class rename to src/test/resources/fitnesse-target/fitnesse/components/ReferenceRenamer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/RegularExpressionWikiPageFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/RegularExpressionWikiPageFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/RegularExpressionWikiPageFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/RegularExpressionWikiPageFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/RegularExpressionWikiPageFinderTest$1.class b/src/test/resources/fitnesse-target/fitnesse/components/RegularExpressionWikiPageFinderTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/RegularExpressionWikiPageFinderTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/components/RegularExpressionWikiPageFinderTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/RegularExpressionWikiPageFinderTest$EmptyListMatcher.class b/src/test/resources/fitnesse-target/fitnesse/components/RegularExpressionWikiPageFinderTest$EmptyListMatcher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/RegularExpressionWikiPageFinderTest$EmptyListMatcher.class rename to src/test/resources/fitnesse-target/fitnesse/components/RegularExpressionWikiPageFinderTest$EmptyListMatcher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/RegularExpressionWikiPageFinderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/RegularExpressionWikiPageFinderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/RegularExpressionWikiPageFinderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/RegularExpressionWikiPageFinderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/SaveRecorder$MergeDeterminer.class b/src/test/resources/fitnesse-target/fitnesse/components/SaveRecorder$MergeDeterminer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/SaveRecorder$MergeDeterminer.class rename to src/test/resources/fitnesse-target/fitnesse/components/SaveRecorder$MergeDeterminer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/SaveRecorder.class b/src/test/resources/fitnesse-target/fitnesse/components/SaveRecorder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/SaveRecorder.class rename to src/test/resources/fitnesse-target/fitnesse/components/SaveRecorder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/SaveRecorderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/SaveRecorderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/SaveRecorderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/SaveRecorderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/SocketDealer.class b/src/test/resources/fitnesse-target/fitnesse/components/SocketDealer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/SocketDealer.class rename to src/test/resources/fitnesse-target/fitnesse/components/SocketDealer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/SocketDealerTest$SimpleDoner.class b/src/test/resources/fitnesse-target/fitnesse/components/SocketDealerTest$SimpleDoner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/SocketDealerTest$SimpleDoner.class rename to src/test/resources/fitnesse-target/fitnesse/components/SocketDealerTest$SimpleDoner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/SocketDealerTest.class b/src/test/resources/fitnesse-target/fitnesse/components/SocketDealerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/SocketDealerTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/SocketDealerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/SuiteSpecificationMatchFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/SuiteSpecificationMatchFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/SuiteSpecificationMatchFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/SuiteSpecificationMatchFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/SuiteSpecificationMatchFinderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/SuiteSpecificationMatchFinderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/SuiteSpecificationMatchFinderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/SuiteSpecificationMatchFinderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/TitleWikiPageFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/TitleWikiPageFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/TitleWikiPageFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/TitleWikiPageFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/TitleWikiPageFinderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/TitleWikiPageFinderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/TitleWikiPageFinderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/TitleWikiPageFinderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/TraversalListener.class b/src/test/resources/fitnesse-target/fitnesse/components/TraversalListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/TraversalListener.class rename to src/test/resources/fitnesse-target/fitnesse/components/TraversalListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/Traverser.class b/src/test/resources/fitnesse-target/fitnesse/components/Traverser.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/Traverser.class rename to src/test/resources/fitnesse-target/fitnesse/components/Traverser.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/WhereUsedPageFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/WhereUsedPageFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/WhereUsedPageFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/WhereUsedPageFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/WhereUsedPageFinderTest.class b/src/test/resources/fitnesse-target/fitnesse/components/WhereUsedPageFinderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/WhereUsedPageFinderTest.class rename to src/test/resources/fitnesse-target/fitnesse/components/WhereUsedPageFinderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/components/WikiPageFinder.class b/src/test/resources/fitnesse-target/fitnesse/components/WikiPageFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/components/WikiPageFinder.class rename to src/test/resources/fitnesse-target/fitnesse/components/WikiPageFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ActionFixtureTestFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/ActionFixtureTestFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ActionFixtureTestFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/ActionFixtureTestFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/AuthenticatorSetup.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/AuthenticatorSetup.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/AuthenticatorSetup.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/AuthenticatorSetup.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ClasspathPrintingFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/ClasspathPrintingFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ClasspathPrintingFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/ClasspathPrintingFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ClockFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/ClockFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ClockFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/ClockFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ColumnFixtureTestFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/ColumnFixtureTestFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ColumnFixtureTestFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/ColumnFixtureTestFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ComplexAddFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/ComplexAddFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ComplexAddFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/ComplexAddFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/CountFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/CountFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/CountFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/CountFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/DelayedCountFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/DelayedCountFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/DelayedCountFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/DelayedCountFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/DuplicateRows.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/DuplicateRows.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/DuplicateRows.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/DuplicateRows.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/EchoFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/EchoFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/EchoFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/EchoFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/EmployeePayRecord.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/EmployeePayRecord.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/EmployeePayRecord.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/EmployeePayRecord.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/EmployeePayRecordsRowFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/EmployeePayRecordsRowFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/EmployeePayRecordsRowFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/EmployeePayRecordsRowFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSection.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/FileSection.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSection.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/FileSection.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSectionDirectoryListing.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/FileSectionDirectoryListing.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSectionDirectoryListing.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/FileSectionDirectoryListing.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSectionFileAdder.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/FileSectionFileAdder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSectionFileAdder.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/FileSectionFileAdder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSystemPageSetUp.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/FileSystemPageSetUp.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSystemPageSetUp.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/FileSystemPageSetUp.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSystemPageTearDown.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/FileSystemPageTearDown.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FileSystemPageTearDown.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/FileSystemPageTearDown.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FitNesseStatus.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/FitNesseStatus.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FitNesseStatus.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/FitNesseStatus.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FitnesseFixtureContext.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/FitnesseFixtureContext.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/FitnesseFixtureContext.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/FitnesseFixtureContext.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/JavaProperties.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/JavaProperties.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/JavaProperties.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/JavaProperties.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/LoopingActionFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/LoopingActionFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/LoopingActionFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/LoopingActionFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/NullAndBlankFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/NullAndBlankFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/NullAndBlankFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/NullAndBlankFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageBuilder.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PageBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PageBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageCreator.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PageCreator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageCreator.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PageCreator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageCreatorTest.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PageCreatorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageCreatorTest.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PageCreatorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageDriver$HasAttributePrefixFilter.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PageDriver$HasAttributePrefixFilter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageDriver$HasAttributePrefixFilter.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PageDriver$HasAttributePrefixFilter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageDriver.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PageDriver.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageDriver.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PageDriver.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageDriverTest.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PageDriverTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageDriverTest.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PageDriverTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageHistory.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PageHistory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PageHistory.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PageHistory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PagesRunInSuite.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PagesRunInSuite.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PagesRunInSuite.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PagesRunInSuite.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/Pass.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/Pass.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/Pass.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/Pass.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PayCheckRecord.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PayCheckRecord.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PayCheckRecord.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PayCheckRecord.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PayCheckRecordFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PayCheckRecordFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PayCheckRecordFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PayCheckRecordFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PrimeData.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PrimeData.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PrimeData.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PrimeData.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PrimeFactorsFixture$Factor.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PrimeFactorsFixture$Factor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PrimeFactorsFixture$Factor.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PrimeFactorsFixture$Factor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PrimeFactorsFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PrimeFactorsFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PrimeFactorsFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PrimeFactorsFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PrimeNumberRowFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/PrimeNumberRowFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/PrimeNumberRowFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/PrimeNumberRowFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RenderFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/RenderFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RenderFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/RenderFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ResponseExaminer.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/ResponseExaminer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ResponseExaminer.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/ResponseExaminer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ResponseExaminerTest.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/ResponseExaminerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ResponseExaminerTest.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/ResponseExaminerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ResponseRequester.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/ResponseRequester.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/ResponseRequester.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/ResponseRequester.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RowEntryExample.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/RowEntryExample.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RowEntryExample.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/RowEntryExample.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RowEntryFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/RowEntryFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RowEntryFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/RowEntryFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RowEntryFixtureTest$1.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/RowEntryFixtureTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RowEntryFixtureTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/RowEntryFixtureTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RowEntryFixtureTest.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/RowEntryFixtureTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/RowEntryFixtureTest.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/RowEntryFixtureTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SavePageRequester.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/SavePageRequester.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SavePageRequester.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/SavePageRequester.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SetUp$1.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/SetUp$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SetUp$1.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/SetUp$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SetUp.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/SetUp.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SetUp.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/SetUp.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/Sleep.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/Sleep.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/Sleep.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/Sleep.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SplitFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/SplitFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SplitFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/SplitFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/StringComparator.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/StringComparator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/StringComparator.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/StringComparator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/StringFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/StringFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/StringFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/StringFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SystemExitTable.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/SystemExitTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SystemExitTable.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/SystemExitTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SystemPropertySetterFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/SystemPropertySetterFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/SystemPropertySetterFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/SystemPropertySetterFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/TableFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/TableFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/TableFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/TableFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/TableOrDecisionFixture.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/TableOrDecisionFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/TableOrDecisionFixture.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/TableOrDecisionFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/fixtures/TearDown.class b/src/test/resources/fitnesse-target/fitnesse/fixtures/TearDown.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/fixtures/TearDown.class rename to src/test/resources/fitnesse-target/fitnesse/fixtures/TearDown.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlElement.class b/src/test/resources/fitnesse-target/fitnesse/html/HtmlElement.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlElement.class rename to src/test/resources/fitnesse-target/fitnesse/html/HtmlElement.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlTag$Attribute.class b/src/test/resources/fitnesse-target/fitnesse/html/HtmlTag$Attribute.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlTag$Attribute.class rename to src/test/resources/fitnesse-target/fitnesse/html/HtmlTag$Attribute.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlTag$HtmlFormatter.class b/src/test/resources/fitnesse-target/fitnesse/html/HtmlTag$HtmlFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlTag$HtmlFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/html/HtmlTag$HtmlFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlTag.class b/src/test/resources/fitnesse-target/fitnesse/html/HtmlTag.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlTag.class rename to src/test/resources/fitnesse-target/fitnesse/html/HtmlTag.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlTagTest.class b/src/test/resources/fitnesse-target/fitnesse/html/HtmlTagTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlTagTest.class rename to src/test/resources/fitnesse-target/fitnesse/html/HtmlTagTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlText.class b/src/test/resources/fitnesse-target/fitnesse/html/HtmlText.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlText.class rename to src/test/resources/fitnesse-target/fitnesse/html/HtmlText.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlUtil.class b/src/test/resources/fitnesse-target/fitnesse/html/HtmlUtil.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlUtil.class rename to src/test/resources/fitnesse-target/fitnesse/html/HtmlUtil.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlUtilTest.class b/src/test/resources/fitnesse-target/fitnesse/html/HtmlUtilTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/HtmlUtilTest.class rename to src/test/resources/fitnesse-target/fitnesse/html/HtmlUtilTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/RawHtml.class b/src/test/resources/fitnesse-target/fitnesse/html/RawHtml.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/RawHtml.class rename to src/test/resources/fitnesse-target/fitnesse/html/RawHtml.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/html/TagGroup.class b/src/test/resources/fitnesse-target/fitnesse/html/TagGroup.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/html/TagGroup.class rename to src/test/resources/fitnesse-target/fitnesse/html/TagGroup.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/ChunkedDataProvider.class b/src/test/resources/fitnesse-target/fitnesse/http/ChunkedDataProvider.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/ChunkedDataProvider.class rename to src/test/resources/fitnesse-target/fitnesse/http/ChunkedDataProvider.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/ChunkedResponse$1.class b/src/test/resources/fitnesse-target/fitnesse/http/ChunkedResponse$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/ChunkedResponse$1.class rename to src/test/resources/fitnesse-target/fitnesse/http/ChunkedResponse$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/ChunkedResponse.class b/src/test/resources/fitnesse-target/fitnesse/http/ChunkedResponse.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/ChunkedResponse.class rename to src/test/resources/fitnesse-target/fitnesse/http/ChunkedResponse.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/ChunkedResponseTest.class b/src/test/resources/fitnesse-target/fitnesse/http/ChunkedResponseTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/ChunkedResponseTest.class rename to src/test/resources/fitnesse-target/fitnesse/http/ChunkedResponseTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/HttpException.class b/src/test/resources/fitnesse-target/fitnesse/http/HttpException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/HttpException.class rename to src/test/resources/fitnesse-target/fitnesse/http/HttpException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/InputStreamResponse.class b/src/test/resources/fitnesse-target/fitnesse/http/InputStreamResponse.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/InputStreamResponse.class rename to src/test/resources/fitnesse-target/fitnesse/http/InputStreamResponse.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/InputStreamResponseTest.class b/src/test/resources/fitnesse-target/fitnesse/http/InputStreamResponseTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/InputStreamResponseTest.class rename to src/test/resources/fitnesse-target/fitnesse/http/InputStreamResponseTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/MockChunkedDataProvider.class b/src/test/resources/fitnesse-target/fitnesse/http/MockChunkedDataProvider.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/MockChunkedDataProvider.class rename to src/test/resources/fitnesse-target/fitnesse/http/MockChunkedDataProvider.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/MockRequest.class b/src/test/resources/fitnesse-target/fitnesse/http/MockRequest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/MockRequest.class rename to src/test/resources/fitnesse-target/fitnesse/http/MockRequest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/MockRequestBuilder.class b/src/test/resources/fitnesse-target/fitnesse/http/MockRequestBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/MockRequestBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/http/MockRequestBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/MockRequestBuilderTest.class b/src/test/resources/fitnesse-target/fitnesse/http/MockRequestBuilderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/MockRequestBuilderTest.class rename to src/test/resources/fitnesse-target/fitnesse/http/MockRequestBuilderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/MockResponseSender$OutputStreamSender.class b/src/test/resources/fitnesse-target/fitnesse/http/MockResponseSender$OutputStreamSender.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/MockResponseSender$OutputStreamSender.class rename to src/test/resources/fitnesse-target/fitnesse/http/MockResponseSender$OutputStreamSender.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/MockResponseSender.class b/src/test/resources/fitnesse-target/fitnesse/http/MockResponseSender.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/MockResponseSender.class rename to src/test/resources/fitnesse-target/fitnesse/http/MockResponseSender.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/Request.class b/src/test/resources/fitnesse-target/fitnesse/http/Request.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/Request.class rename to src/test/resources/fitnesse-target/fitnesse/http/Request.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/RequestBuilder$InputStreamPart.class b/src/test/resources/fitnesse-target/fitnesse/http/RequestBuilder$InputStreamPart.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/RequestBuilder$InputStreamPart.class rename to src/test/resources/fitnesse-target/fitnesse/http/RequestBuilder$InputStreamPart.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/RequestBuilder.class b/src/test/resources/fitnesse-target/fitnesse/http/RequestBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/RequestBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/http/RequestBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/RequestBuilderTest.class b/src/test/resources/fitnesse-target/fitnesse/http/RequestBuilderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/RequestBuilderTest.class rename to src/test/resources/fitnesse-target/fitnesse/http/RequestBuilderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/RequestTest.class b/src/test/resources/fitnesse-target/fitnesse/http/RequestTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/RequestTest.class rename to src/test/resources/fitnesse-target/fitnesse/http/RequestTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/Response$1.class b/src/test/resources/fitnesse-target/fitnesse/http/Response$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/Response$1.class rename to src/test/resources/fitnesse-target/fitnesse/http/Response$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/Response$Format.class b/src/test/resources/fitnesse-target/fitnesse/http/Response$Format.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/Response$Format.class rename to src/test/resources/fitnesse-target/fitnesse/http/Response$Format.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/Response.class b/src/test/resources/fitnesse-target/fitnesse/http/Response.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/Response.class rename to src/test/resources/fitnesse-target/fitnesse/http/Response.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseParser.class b/src/test/resources/fitnesse-target/fitnesse/http/ResponseParser.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseParser.class rename to src/test/resources/fitnesse-target/fitnesse/http/ResponseParser.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseParserTest.class b/src/test/resources/fitnesse-target/fitnesse/http/ResponseParserTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseParserTest.class rename to src/test/resources/fitnesse-target/fitnesse/http/ResponseParserTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseSender.class b/src/test/resources/fitnesse-target/fitnesse/http/ResponseSender.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseSender.class rename to src/test/resources/fitnesse-target/fitnesse/http/ResponseSender.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseTest$MockResponse.class b/src/test/resources/fitnesse-target/fitnesse/http/ResponseTest$MockResponse.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseTest$MockResponse.class rename to src/test/resources/fitnesse-target/fitnesse/http/ResponseTest$MockResponse.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseTest.class b/src/test/resources/fitnesse-target/fitnesse/http/ResponseTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/ResponseTest.class rename to src/test/resources/fitnesse-target/fitnesse/http/ResponseTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/SimpleResponse.class b/src/test/resources/fitnesse-target/fitnesse/http/SimpleResponse.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/SimpleResponse.class rename to src/test/resources/fitnesse-target/fitnesse/http/SimpleResponse.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/SimpleResponseTest.class b/src/test/resources/fitnesse-target/fitnesse/http/SimpleResponseTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/SimpleResponseTest.class rename to src/test/resources/fitnesse-target/fitnesse/http/SimpleResponseTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/http/UploadedFile.class b/src/test/resources/fitnesse-target/fitnesse/http/UploadedFile.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/http/UploadedFile.class rename to src/test/resources/fitnesse-target/fitnesse/http/UploadedFile.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$DebugMode.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$DebugMode.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$DebugMode.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$DebugMode.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$ExcludeSuiteFilter.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$ExcludeSuiteFilter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$ExcludeSuiteFilter.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$ExcludeSuiteFilter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$FitnesseDir.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$FitnesseDir.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$FitnesseDir.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$FitnesseDir.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$Name.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$Name.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$Name.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$Name.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$OutputDir.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$OutputDir.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$OutputDir.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$OutputDir.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$Port.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$Port.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$Port.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$Port.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$SuiteFilter.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$SuiteFilter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite$SuiteFilter.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite$SuiteFilter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuite.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuite.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuiteArgumentsTest.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuiteArgumentsTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuiteArgumentsTest.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuiteArgumentsTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuiteExampleTest.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuiteExampleTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuiteExampleTest.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuiteExampleTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuiteExampleTestNoDebug.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuiteExampleTestNoDebug.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuiteExampleTestNoDebug.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuiteExampleTestNoDebug.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuiteWithFilterExampleTest.class b/src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuiteWithFilterExampleTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/FitNesseSuiteWithFilterExampleTest.class rename to src/test/resources/fitnesse-target/fitnesse/junit/FitNesseSuiteWithFilterExampleTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitHelper.class b/src/test/resources/fitnesse-target/fitnesse/junit/JUnitHelper.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitHelper.class rename to src/test/resources/fitnesse-target/fitnesse/junit/JUnitHelper.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitHelperExampleTest.class b/src/test/resources/fitnesse-target/fitnesse/junit/JUnitHelperExampleTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitHelperExampleTest.class rename to src/test/resources/fitnesse-target/fitnesse/junit/JUnitHelperExampleTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitRunNotifierResultsListener.class b/src/test/resources/fitnesse-target/fitnesse/junit/JUnitRunNotifierResultsListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitRunNotifierResultsListener.class rename to src/test/resources/fitnesse-target/fitnesse/junit/JUnitRunNotifierResultsListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitXMLTestListener.class b/src/test/resources/fitnesse-target/fitnesse/junit/JUnitXMLTestListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitXMLTestListener.class rename to src/test/resources/fitnesse-target/fitnesse/junit/JUnitXMLTestListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitXmlTestListenerIntegrationTest.class b/src/test/resources/fitnesse-target/fitnesse/junit/JUnitXmlTestListenerIntegrationTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/JUnitXmlTestListenerIntegrationTest.class rename to src/test/resources/fitnesse-target/fitnesse/junit/JUnitXmlTestListenerIntegrationTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/PrintTestListener.class b/src/test/resources/fitnesse-target/fitnesse/junit/PrintTestListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/PrintTestListener.class rename to src/test/resources/fitnesse-target/fitnesse/junit/PrintTestListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/TestHelper.class b/src/test/resources/fitnesse-target/fitnesse/junit/TestHelper.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/TestHelper.class rename to src/test/resources/fitnesse-target/fitnesse/junit/TestHelper.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/junit/TestHelperTest.class b/src/test/resources/fitnesse-target/fitnesse/junit/TestHelperTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/junit/TestHelperTest.class rename to src/test/resources/fitnesse-target/fitnesse/junit/TestHelperTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/img/glyphicons-halflings-white.png b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/img/glyphicons-halflings-white.png rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/img/glyphicons-halflings-white.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/img/glyphicons-halflings.png b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/img/glyphicons-halflings.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/img/glyphicons-halflings.png rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/img/glyphicons-halflings.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/img/minus-sign.png b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/img/minus-sign.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/img/minus-sign.png rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/img/minus-sign.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/img/plus-sign.png b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/img/plus-sign.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/img/plus-sign.png rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/img/plus-sign.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/js/bootstrap.js b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/js/bootstrap.js similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/js/bootstrap.js rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/js/bootstrap.js index f73fcb8..2e6f640 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/js/bootstrap.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/js/bootstrap.js @@ -1,2027 +1,2027 @@ -/* =================================================== - * bootstrap-transition.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - $(function () { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-alert.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.trigger(e = $.Event('close')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT DATA-API - * ============== */ - - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-button.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - Button.prototype.toggle = function () { - var $parent = this.$element.closest('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON DATA-API - * =============== */ - - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - }) - -}(window.jQuery);/* ========================================================== - * bootstrap-carousel.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.options = options - this.options.slide && this.slide(this.options.slide) - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this - } - - , to: function (pos) { - var $active = this.$element.find('.item.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this - - if (pos > (children.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activePos == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - if (this.$element.find('.next, .prev').length && $.support.transition.end) { - this.$element.trigger($.support.transition.end) - this.cycle() - } - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.item.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e = $.Event('slide', { - relatedTarget: $next[0] - }) - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - if ($next.hasClass('active')) return - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - , action = typeof option == 'string' ? option : options.slide - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() - else if (options.interval) data.cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL DATA-API - * ================= */ - - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-collapse.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - $.support.transition && this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSIBLE DATA-API - * ==================== */ - - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) - }) - }) - -}(window.jQuery);/* ============================================================ - * bootstrap-dropdown.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle=dropdown]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function (e) { - var $this = $(this) - , $parent - , isActive - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) { - $parent.toggleClass('open') - $this.focus() - } - - return false - } - - , keydown: function (e) { - var $this - , $items - , $active - , $parent - , isActive - , index - - if (!/(38|40|27)/.test(e.keyCode)) return - - $this = $(this) - - e.preventDefault() - e.stopPropagation() - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - if (!isActive || (isActive && e.keyCode == 27)) return $this.click() - - $items = $('[role=menu] li:not(.divider) a', $parent) - - if (!$items.length) return - - index = $items.index($items.filter(':focus')) - - if (e.keyCode == 38 && index > 0) index-- // up - if (e.keyCode == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 - - $items - .eq(index) - .focus() - } - - } - - function clearMenus() { - getParent($(toggle)) - .removeClass('open') - } - - function getParent($this) { - var selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.length || ($parent = $this.parent()) - - return $parent - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(function () { - $('html') - .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - $('body') - .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - }) - -}(window.jQuery);/* ========================================================= - * bootstrap-modal.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (element, options) { - this.options = options - this.$element = $(element) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - this.options.remote && this.$element.find('.modal-body').load(this.options.remote) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - $('body').addClass('modal-open') - - this.isShown = true - - this.escape() - - this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element - .addClass('in') - .attr('aria-hidden', false) - .focus() - - that.enforceFocus() - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function (e) { - e && e.preventDefault() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - $('body').removeClass('modal-open') - - this.escape() - - $(document).off('focusin.modal') - - this.$element - .removeClass('in') - .attr('aria-hidden', true) - - $.support.transition && this.$element.hasClass('fade') ? - this.hideWithTransition() : - this.hideModal() - } - - , enforceFocus: function () { - var that = this - $(document).on('focusin.modal', function (e) { - if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { - that.$element.focus() - } - }) - } - - , escape: function () { - var that = this - if (this.isShown && this.options.keyboard) { - this.$element.on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - this.$element.off('keyup.dismiss.modal') - } - } - - , hideWithTransition: function () { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - that.hideModal() - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - that.hideModal() - }) - } - - , hideModal: function (that) { - this.$element - .hide() - .trigger('hidden') - - this.backdrop() - } - - , removeBackdrop: function () { - this.$backdrop.remove() - this.$backdrop = null - } - - , backdrop: function (callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
') - .appendTo(document.body) - - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) : - this.removeBackdrop() - - } else if (callback) { - callback() - } - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL DATA-API - * ============== */ - - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this) - , href = $this.attr('href') - , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) - - e.preventDefault() - - $target - .modal(option) - .one('hide', function () { - $this.focus() - }) - }) - }) - -}(window.jQuery);/* =========================================================== - * bootstrap-tooltip.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function (element, options) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function (type, element, options) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) return self.show() - - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - , leave: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (this.timeout) clearTimeout(this.timeout) - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - - return this - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , placement: 'top' - , selector: false - , template: '
' - , trigger: 'hover' - , title: '' - , delay: 0 - , html: true - } - -}(window.jQuery); -/* =========================================================== - * bootstrap-popover.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ - - var Popover = function (element, options) { - this.init('popover', element, options) - } - - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - return content - } - - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , trigger: 'click' - , content: '' - , template: '

' - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-scrollspy.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy(element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body') - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - var self = this - , $targets - - this.offsets = $([]) - this.targets = $([]) - - $targets = this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - , href = $el.data('target') || $el.attr('href') - , $href = /^#\w/.test(href) && $(href) - return ( $href - && $href.length - && [[ $href.position().top, href ]] ) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight - , maxScroll = scrollHeight - this.$scrollElement.height() - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets.last()[0]) - && this.activate ( i ) - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - , selector - - this.activeTarget = target - - $(this.selector) - .parent('.active') - .removeClass('active') - - selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' - - active = $(selector) - .parent('li') - .addClass('active') - - if (active.parent('.dropdown-menu').length) { - active = active.closest('li.dropdown').addClass('active') - } - - active.trigger('activate') - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollspy = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(window).on('load', function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}(window.jQuery);/* ======================================================== - * bootstrap-tab.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function (element) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - , e - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active a').last()[0] - - e = $.Event('show', { - relatedTarget: previous - }) - - $this.trigger(e) - - if (e.isDefaultPrevented()) return - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB DATA-API - * ============ */ - - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - }) - -}(window.jQuery);/* ============================================================= - * bootstrap-typeahead.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function($){ - - "use strict"; // jshint ;_; - - - /* TYPEAHEAD PUBLIC CLASS DEFINITION - * ================================= */ - - var Typeahead = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.updater = this.options.updater || this.updater - this.$menu = $(this.options.menu).appendTo('body') - this.source = this.options.source - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element - .val(this.updater(val)) - .change() - return this.hide() - } - - , updater: function (item) { - return item - } - - , show: function () { - var pos = $.extend({}, this.$element.offset(), { - height: this.$element[0].offsetHeight - }) - - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) - - this.$menu.show() - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var items - - this.query = this.$element.val() - - if (!this.query || this.query.length < this.options.minLength) { - return this.shown ? this.hide() : this - } - - items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source - - return items ? this.process(items) : this - } - - , process: function (items) { - var that = this - - items = $.grep(items, function (item) { - return that.matcher(item) - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') - return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if ($.browser.chrome || $.browser.webkit || $.browser.msie) { - this.$element.on('keydown', $.proxy(this.keydown, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } - - , move: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - e.preventDefault() - this.prev() - break - - case 40: // down arrow - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , keydown: function (e) { - this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27]) - this.move(e) - } - - , keypress: function (e) { - if (this.suppressKeyPressRepeat) return - this.move(e) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , blur: function (e) { - var that = this - setTimeout(function () { that.hide() }, 150) - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } - - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - $.fn.typeahead = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
    ' - , item: '
    • ' - , minLength: 1 - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) - }) - -}(window.jQuery); -/* ========================================================== - * bootstrap-affix.js v2.1.1 - * http://twitter.github.com/bootstrap/javascript.html#affix - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* AFFIX CLASS DEFINITION - * ====================== */ - - var Affix = function (element, options) { - this.options = $.extend({}, $.fn.affix.defaults, options) - this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) - this.$element = $(element) - this.checkPosition() - } - - Affix.prototype.checkPosition = function () { - if (!this.$element.is(':visible')) return - - var scrollHeight = $(document).height() - , scrollTop = this.$window.scrollTop() - , position = this.$element.offset() - , offset = this.options.offset - , offsetBottom = offset.bottom - , offsetTop = offset.top - , reset = 'affix affix-top affix-bottom' - , affix - - if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top() - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() - - affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? - false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? - 'bottom' : offsetTop != null && scrollTop <= offsetTop ? - 'top' : false - - if (this.affixed === affix) return - - this.affixed = affix - this.unpin = affix == 'bottom' ? position.top - scrollTop : null - - this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) - } - - - /* AFFIX PLUGIN DEFINITION - * ======================= */ - - $.fn.affix = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('affix') - , options = typeof option == 'object' && option - if (!data) $this.data('affix', (data = new Affix(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.affix.Constructor = Affix - - $.fn.affix.defaults = { - offset: 0 - } - - - /* AFFIX DATA-API - * ============== */ - - $(window).on('load', function () { - $('[data-spy="affix"]').each(function () { - var $spy = $(this) - , data = $spy.data() - - data.offset = data.offset || {} - - data.offsetBottom && (data.offset.bottom = data.offsetBottom) - data.offsetTop && (data.offset.top = data.offsetTop) - - $spy.affix(data) - }) - }) - - +/* =================================================== + * bootstrap-transition.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#transitions + * =================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function ($) { + + $(function () { + + "use strict"; // jshint ;_; + + + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) + * ======================================================= */ + + $.support.transition = (function () { + + var transitionEnd = (function () { + + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' + , 'transition' : 'transitionend' + } + , name + + for (name in transEndEventNames){ + if (el.style[name] !== undefined) { + return transEndEventNames[name] + } + } + + }()) + + return transitionEnd && { + end: transitionEnd + } + + })() + + }) + +}(window.jQuery);/* ========================================================== + * bootstrap-alert.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#alerts + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* ALERT CLASS DEFINITION + * ====================== */ + + var dismiss = '[data-dismiss="alert"]' + , Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + , selector = $this.attr('data-target') + , $parent + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + $parent = $(selector) + + e && e.preventDefault() + + $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) + + $parent.trigger(e = $.Event('close')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent + .trigger('closed') + .remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent.on($.support.transition.end, removeElement) : + removeElement() + } + + + /* ALERT PLUGIN DEFINITION + * ======================= */ + + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('alert') + if (!data) $this.data('alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + /* ALERT DATA-API + * ============== */ + + $(function () { + $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) + }) + +}(window.jQuery);/* ============================================================ + * bootstrap-button.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#buttons + * ============================================================ + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* BUTTON PUBLIC CLASS DEFINITION + * ============================== */ + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.button.defaults, options) + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + , $el = this.$element + , data = $el.data() + , val = $el.is('input') ? 'val' : 'html' + + state = state + 'Text' + data.resetText || $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d) + }, 0) + } + + Button.prototype.toggle = function () { + var $parent = this.$element.closest('[data-toggle="buttons-radio"]') + + $parent && $parent + .find('.active') + .removeClass('active') + + this.$element.toggleClass('active') + } + + + /* BUTTON PLUGIN DEFINITION + * ======================== */ + + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('button') + , options = typeof option == 'object' && option + if (!data) $this.data('button', (data = new Button(this, options))) + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.defaults = { + loadingText: 'loading...' + } + + $.fn.button.Constructor = Button + + + /* BUTTON DATA-API + * =============== */ + + $(function () { + $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + }) + }) + +}(window.jQuery);/* ========================================================== + * bootstrap-carousel.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#carousel + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* CAROUSEL CLASS DEFINITION + * ========================= */ + + var Carousel = function (element, options) { + this.$element = $(element) + this.options = options + this.options.slide && this.slide(this.options.slide) + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) + } + + Carousel.prototype = { + + cycle: function (e) { + if (!e) this.paused = false + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + return this + } + + , to: function (pos) { + var $active = this.$element.find('.item.active') + , children = $active.parent().children() + , activePos = children.index($active) + , that = this + + if (pos > (children.length - 1) || pos < 0) return + + if (this.sliding) { + return this.$element.one('slid', function () { + that.to(pos) + }) + } + + if (activePos == pos) { + return this.pause().cycle() + } + + return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) + } + + , pause: function (e) { + if (!e) this.paused = true + if (this.$element.find('.next, .prev').length && $.support.transition.end) { + this.$element.trigger($.support.transition.end) + this.cycle() + } + clearInterval(this.interval) + this.interval = null + return this + } + + , next: function () { + if (this.sliding) return + return this.slide('next') + } + + , prev: function () { + if (this.sliding) return + return this.slide('prev') + } + + , slide: function (type, next) { + var $active = this.$element.find('.item.active') + , $next = next || $active[type]() + , isCycling = this.interval + , direction = type == 'next' ? 'left' : 'right' + , fallback = type == 'next' ? 'first' : 'last' + , that = this + , e = $.Event('slide', { + relatedTarget: $next[0] + }) + + this.sliding = true + + isCycling && this.pause() + + $next = $next.length ? $next : this.$element.find('.item')[fallback]() + + if ($next.hasClass('active')) return + + if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + this.$element.one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid') }, 0) + }) + } else { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') + } + + isCycling && this.cycle() + + return this + } + + } + + + /* CAROUSEL PLUGIN DEFINITION + * ========================== */ + + $.fn.carousel = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('carousel') + , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) + , action = typeof option == 'string' ? option : options.slide + if (!data) $this.data('carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.cycle() + }) + } + + $.fn.carousel.defaults = { + interval: 5000 + , pause: 'hover' + } + + $.fn.carousel.Constructor = Carousel + + + /* CAROUSEL DATA-API + * ================= */ + + $(function () { + $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { + var $this = $(this), href + , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) + $target.carousel(options) + e.preventDefault() + }) + }) + +}(window.jQuery);/* ============================================================= + * bootstrap-collapse.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#collapse + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* COLLAPSE PUBLIC CLASS DEFINITION + * ================================ */ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.collapse.defaults, options) + + if (this.options.parent) { + this.$parent = $(this.options.parent) + } + + this.options.toggle && this.toggle() + } + + Collapse.prototype = { + + constructor: Collapse + + , dimension: function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + , show: function () { + var dimension + , scroll + , actives + , hasData + + if (this.transitioning) return + + dimension = this.dimension() + scroll = $.camelCase(['scroll', dimension].join('-')) + actives = this.$parent && this.$parent.find('> .accordion-group > .in') + + if (actives && actives.length) { + hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('collapse', null) + } + + this.$element[dimension](0) + this.transition('addClass', $.Event('show'), 'shown') + $.support.transition && this.$element[dimension](this.$element[0][scroll]) + } + + , hide: function () { + var dimension + if (this.transitioning) return + dimension = this.dimension() + this.reset(this.$element[dimension]()) + this.transition('removeClass', $.Event('hide'), 'hidden') + this.$element[dimension](0) + } + + , reset: function (size) { + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + [dimension](size || 'auto') + [0].offsetWidth + + this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') + + return this + } + + , transition: function (method, startEvent, completeEvent) { + var that = this + , complete = function () { + if (startEvent.type == 'show') that.reset() + that.transitioning = 0 + that.$element.trigger(completeEvent) + } + + this.$element.trigger(startEvent) + + if (startEvent.isDefaultPrevented()) return + + this.transitioning = 1 + + this.$element[method]('in') + + $.support.transition && this.$element.hasClass('collapse') ? + this.$element.one($.support.transition.end, complete) : + complete() + } + + , toggle: function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + } + + + /* COLLAPSIBLE PLUGIN DEFINITION + * ============================== */ + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('collapse') + , options = typeof option == 'object' && option + if (!data) $this.data('collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.defaults = { + toggle: true + } + + $.fn.collapse.Constructor = Collapse + + + /* COLLAPSIBLE DATA-API + * ==================== */ + + $(function () { + $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + , target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + , option = $(target).data('collapse') ? 'toggle' : $this.data() + $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + $(target).collapse(option) + }) + }) + +}(window.jQuery);/* ============================================================ + * bootstrap-dropdown.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#dropdowns + * ============================================================ + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* DROPDOWN CLASS DEFINITION + * ========================= */ + + var toggle = '[data-toggle=dropdown]' + , Dropdown = function (element) { + var $el = $(element).on('click.dropdown.data-api', this.toggle) + $('html').on('click.dropdown.data-api', function () { + $el.parent().removeClass('open') + }) + } + + Dropdown.prototype = { + + constructor: Dropdown + + , toggle: function (e) { + var $this = $(this) + , $parent + , isActive + + if ($this.is('.disabled, :disabled')) return + + $parent = getParent($this) + + isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + $parent.toggleClass('open') + $this.focus() + } + + return false + } + + , keydown: function (e) { + var $this + , $items + , $active + , $parent + , isActive + , index + + if (!/(38|40|27)/.test(e.keyCode)) return + + $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + $parent = getParent($this) + + isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) return $this.click() + + $items = $('[role=menu] li:not(.divider) a', $parent) + + if (!$items.length) return + + index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index = 0 + + $items + .eq(index) + .focus() + } + + } + + function clearMenus() { + getParent($(toggle)) + .removeClass('open') + } + + function getParent($this) { + var selector = $this.attr('data-target') + , $parent + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + $parent = $(selector) + $parent.length || ($parent = $this.parent()) + + return $parent + } + + + /* DROPDOWN PLUGIN DEFINITION + * ========================== */ + + $.fn.dropdown = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('dropdown') + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + /* APPLY TO STANDARD DROPDOWN ELEMENTS + * =================================== */ + + $(function () { + $('html') + .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) + $('body') + .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + }) + +}(window.jQuery);/* ========================================================= + * bootstrap-modal.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#modals + * ========================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================= */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* MODAL CLASS DEFINITION + * ====================== */ + + var Modal = function (element, options) { + this.options = options + this.$element = $(element) + .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + this.options.remote && this.$element.find('.modal-body').load(this.options.remote) + } + + Modal.prototype = { + + constructor: Modal + + , toggle: function () { + return this[!this.isShown ? 'show' : 'hide']() + } + + , show: function () { + var that = this + , e = $.Event('show') + + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + $('body').addClass('modal-open') + + this.isShown = true + + this.escape() + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) //don't move modals dom position + } + + that.$element + .show() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .attr('aria-hidden', false) + .focus() + + that.enforceFocus() + + transition ? + that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : + that.$element.trigger('shown') + + }) + } + + , hide: function (e) { + e && e.preventDefault() + + var that = this + + e = $.Event('hide') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + $('body').removeClass('modal-open') + + this.escape() + + $(document).off('focusin.modal') + + this.$element + .removeClass('in') + .attr('aria-hidden', true) + + $.support.transition && this.$element.hasClass('fade') ? + this.hideWithTransition() : + this.hideModal() + } + + , enforceFocus: function () { + var that = this + $(document).on('focusin.modal', function (e) { + if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { + that.$element.focus() + } + }) + } + + , escape: function () { + var that = this + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.modal', function ( e ) { + e.which == 27 && that.hide() + }) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.modal') + } + } + + , hideWithTransition: function () { + var that = this + , timeout = setTimeout(function () { + that.$element.off($.support.transition.end) + that.hideModal() + }, 500) + + this.$element.one($.support.transition.end, function () { + clearTimeout(timeout) + that.hideModal() + }) + } + + , hideModal: function (that) { + this.$element + .hide() + .trigger('hidden') + + this.backdrop() + } + + , removeBackdrop: function () { + this.$backdrop.remove() + this.$backdrop = null + } + + , backdrop: function (callback) { + var that = this + , animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
    ') + .appendTo(document.body) + + if (this.options.backdrop != 'static') { + this.$backdrop.click($.proxy(this.hide, this)) + } + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + doAnimate ? + this.$backdrop.one($.support.transition.end, callback) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + $.support.transition && this.$element.hasClass('fade')? + this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) : + this.removeBackdrop() + + } else if (callback) { + callback() + } + } + } + + + /* MODAL PLUGIN DEFINITION + * ======================= */ + + $.fn.modal = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('modal') + , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) + if (!data) $this.data('modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option]() + else if (options.show) data.show() + }) + } + + $.fn.modal.defaults = { + backdrop: true + , keyboard: true + , show: true + } + + $.fn.modal.Constructor = Modal + + + /* MODAL DATA-API + * ============== */ + + $(function () { + $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { + var $this = $(this) + , href = $this.attr('href') + , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + , option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) + + e.preventDefault() + + $target + .modal(option) + .one('hide', function () { + $this.focus() + }) + }) + }) + +}(window.jQuery);/* =========================================================== + * bootstrap-tooltip.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#tooltips + * Inspired by the original jQuery.tipsy by Jason Frame + * =========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* TOOLTIP PUBLIC CLASS DEFINITION + * =============================== */ + + var Tooltip = function (element, options) { + this.init('tooltip', element, options) + } + + Tooltip.prototype = { + + constructor: Tooltip + + , init: function (type, element, options) { + var eventIn + , eventOut + + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + this.enabled = true + + if (this.options.trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (this.options.trigger != 'manual') { + eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' + eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + , getOptions: function (options) { + options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } + + return options + } + + , enter: function (e) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + + if (!self.options.delay || !self.options.delay.show) return self.show() + + clearTimeout(this.timeout) + self.hoverState = 'in' + this.timeout = setTimeout(function() { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + , leave: function (e) { + var self = $(e.currentTarget)[this.type](this._options).data(this.type) + + if (this.timeout) clearTimeout(this.timeout) + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.hoverState = 'out' + this.timeout = setTimeout(function() { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + , show: function () { + var $tip + , inside + , pos + , actualWidth + , actualHeight + , placement + , tp + + if (this.hasContent() && this.enabled) { + $tip = this.tip() + this.setContent() + + if (this.options.animation) { + $tip.addClass('fade') + } + + placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + inside = /in/.test(placement) + + $tip + .remove() + .css({ top: 0, left: 0, display: 'block' }) + .appendTo(inside ? this.$element : document.body) + + pos = this.getPosition(inside) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + + switch (inside ? placement.split(' ')[1] : placement) { + case 'bottom': + tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'top': + tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'left': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} + break + case 'right': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} + break + } + + $tip + .css(tp) + .addClass(placement) + .addClass('in') + } + } + + , setContent: function () { + var $tip = this.tip() + , title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + , hide: function () { + var that = this + , $tip = this.tip() + + $tip.removeClass('in') + + function removeWithAnimation() { + var timeout = setTimeout(function () { + $tip.off($.support.transition.end).remove() + }, 500) + + $tip.one($.support.transition.end, function () { + clearTimeout(timeout) + $tip.remove() + }) + } + + $.support.transition && this.$tip.hasClass('fade') ? + removeWithAnimation() : + $tip.remove() + + return this + } + + , fixTitle: function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') + } + } + + , hasContent: function () { + return this.getTitle() + } + + , getPosition: function (inside) { + return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { + width: this.$element[0].offsetWidth + , height: this.$element[0].offsetHeight + }) + } + + , getTitle: function () { + var title + , $e = this.$element + , o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + , tip: function () { + return this.$tip = this.$tip || $(this.options.template) + } + + , validate: function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + , enable: function () { + this.enabled = true + } + + , disable: function () { + this.enabled = false + } + + , toggleEnabled: function () { + this.enabled = !this.enabled + } + + , toggle: function () { + this[this.tip().hasClass('in') ? 'hide' : 'show']() + } + + , destroy: function () { + this.hide().$element.off('.' + this.type).removeData(this.type) + } + + } + + + /* TOOLTIP PLUGIN DEFINITION + * ========================= */ + + $.fn.tooltip = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tooltip') + , options = typeof option == 'object' && option + if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tooltip.Constructor = Tooltip + + $.fn.tooltip.defaults = { + animation: true + , placement: 'top' + , selector: false + , template: '
    ' + , trigger: 'hover' + , title: '' + , delay: 0 + , html: true + } + +}(window.jQuery); +/* =========================================================== + * bootstrap-popover.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#popovers + * =========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* POPOVER PUBLIC CLASS DEFINITION + * =============================== */ + + var Popover = function (element, options) { + this.init('popover', element, options) + } + + + /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js + ========================================== */ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { + + constructor: Popover + + , setContent: function () { + var $tip = this.tip() + , title = this.getTitle() + , content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content) + + $tip.removeClass('fade top bottom left right in') + } + + , hasContent: function () { + return this.getTitle() || this.getContent() + } + + , getContent: function () { + var content + , $e = this.$element + , o = this.options + + content = $e.attr('data-content') + || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) + + return content + } + + , tip: function () { + if (!this.$tip) { + this.$tip = $(this.options.template) + } + return this.$tip + } + + , destroy: function () { + this.hide().$element.off('.' + this.type).removeData(this.type) + } + + }) + + + /* POPOVER PLUGIN DEFINITION + * ======================= */ + + $.fn.popover = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('popover') + , options = typeof option == 'object' && option + if (!data) $this.data('popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.popover.Constructor = Popover + + $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { + placement: 'right' + , trigger: 'click' + , content: '' + , template: '

    ' + }) + +}(window.jQuery);/* ============================================================= + * bootstrap-scrollspy.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#scrollspy + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* SCROLLSPY CLASS DEFINITION + * ========================== */ + + function ScrollSpy(element, options) { + var process = $.proxy(this.process, this) + , $element = $(element).is('body') ? $(window) : $(element) + , href + this.options = $.extend({}, $.fn.scrollspy.defaults, options) + this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) + this.selector = (this.options.target + || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + || '') + ' .nav li > a' + this.$body = $('body') + this.refresh() + this.process() + } + + ScrollSpy.prototype = { + + constructor: ScrollSpy + + , refresh: function () { + var self = this + , $targets + + this.offsets = $([]) + this.targets = $([]) + + $targets = this.$body + .find(this.selector) + .map(function () { + var $el = $(this) + , href = $el.data('target') || $el.attr('href') + , $href = /^#\w/.test(href) && $(href) + return ( $href + && $href.length + && [[ $href.position().top, href ]] ) || null + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) + }) + } + + , process: function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight + , maxScroll = scrollHeight - this.$scrollElement.height() + , offsets = this.offsets + , targets = this.targets + , activeTarget = this.activeTarget + , i + + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets.last()[0]) + && this.activate ( i ) + } + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate( targets[i] ) + } + } + + , activate: function (target) { + var active + , selector + + this.activeTarget = target + + $(this.selector) + .parent('.active') + .removeClass('active') + + selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' + + active = $(selector) + .parent('li') + .addClass('active') + + if (active.parent('.dropdown-menu').length) { + active = active.closest('li.dropdown').addClass('active') + } + + active.trigger('activate') + } + + } + + + /* SCROLLSPY PLUGIN DEFINITION + * =========================== */ + + $.fn.scrollspy = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('scrollspy') + , options = typeof option == 'object' && option + if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.scrollspy.Constructor = ScrollSpy + + $.fn.scrollspy.defaults = { + offset: 10 + } + + + /* SCROLLSPY DATA-API + * ================== */ + + $(window).on('load', function () { + $('[data-spy="scroll"]').each(function () { + var $spy = $(this) + $spy.scrollspy($spy.data()) + }) + }) + +}(window.jQuery);/* ======================================================== + * bootstrap-tab.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#tabs + * ======================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* TAB CLASS DEFINITION + * ==================== */ + + var Tab = function (element) { + this.element = $(element) + } + + Tab.prototype = { + + constructor: Tab + + , show: function () { + var $this = this.element + , $ul = $this.closest('ul:not(.dropdown-menu)') + , selector = $this.attr('data-target') + , previous + , $target + , e + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + if ( $this.parent('li').hasClass('active') ) return + + previous = $ul.find('.active a').last()[0] + + e = $.Event('show', { + relatedTarget: previous + }) + + $this.trigger(e) + + if (e.isDefaultPrevented()) return + + $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown' + , relatedTarget: previous + }) + }) + } + + , activate: function ( element, container, callback) { + var $active = container.find('> .active') + , transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if ( element.parent('.dropdown-menu') ) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active.one($.support.transition.end, next) : + next() + + $active.removeClass('in') + } + } + + + /* TAB PLUGIN DEFINITION + * ===================== */ + + $.fn.tab = function ( option ) { + return this.each(function () { + var $this = $(this) + , data = $this.data('tab') + if (!data) $this.data('tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Constructor = Tab + + + /* TAB DATA-API + * ============ */ + + $(function () { + $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) + }) + +}(window.jQuery);/* ============================================================= + * bootstrap-typeahead.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#typeahead + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function($){ + + "use strict"; // jshint ;_; + + + /* TYPEAHEAD PUBLIC CLASS DEFINITION + * ================================= */ + + var Typeahead = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.typeahead.defaults, options) + this.matcher = this.options.matcher || this.matcher + this.sorter = this.options.sorter || this.sorter + this.highlighter = this.options.highlighter || this.highlighter + this.updater = this.options.updater || this.updater + this.$menu = $(this.options.menu).appendTo('body') + this.source = this.options.source + this.shown = false + this.listen() + } + + Typeahead.prototype = { + + constructor: Typeahead + + , select: function () { + var val = this.$menu.find('.active').attr('data-value') + this.$element + .val(this.updater(val)) + .change() + return this.hide() + } + + , updater: function (item) { + return item + } + + , show: function () { + var pos = $.extend({}, this.$element.offset(), { + height: this.$element[0].offsetHeight + }) + + this.$menu.css({ + top: pos.top + pos.height + , left: pos.left + }) + + this.$menu.show() + this.shown = true + return this + } + + , hide: function () { + this.$menu.hide() + this.shown = false + return this + } + + , lookup: function (event) { + var items + + this.query = this.$element.val() + + if (!this.query || this.query.length < this.options.minLength) { + return this.shown ? this.hide() : this + } + + items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source + + return items ? this.process(items) : this + } + + , process: function (items) { + var that = this + + items = $.grep(items, function (item) { + return that.matcher(item) + }) + + items = this.sorter(items) + + if (!items.length) { + return this.shown ? this.hide() : this + } + + return this.render(items.slice(0, this.options.items)).show() + } + + , matcher: function (item) { + return ~item.toLowerCase().indexOf(this.query.toLowerCase()) + } + + , sorter: function (items) { + var beginswith = [] + , caseSensitive = [] + , caseInsensitive = [] + , item + + while (item = items.shift()) { + if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) + else if (~item.indexOf(this.query)) caseSensitive.push(item) + else caseInsensitive.push(item) + } + + return beginswith.concat(caseSensitive, caseInsensitive) + } + + , highlighter: function (item) { + var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') + return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { + return '' + match + '' + }) + } + + , render: function (items) { + var that = this + + items = $(items).map(function (i, item) { + i = $(that.options.item).attr('data-value', item) + i.find('a').html(that.highlighter(item)) + return i[0] + }) + + items.first().addClass('active') + this.$menu.html(items) + return this + } + + , next: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , next = active.next() + + if (!next.length) { + next = $(this.$menu.find('li')[0]) + } + + next.addClass('active') + } + + , prev: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , prev = active.prev() + + if (!prev.length) { + prev = this.$menu.find('li').last() + } + + prev.addClass('active') + } + + , listen: function () { + this.$element + .on('blur', $.proxy(this.blur, this)) + .on('keypress', $.proxy(this.keypress, this)) + .on('keyup', $.proxy(this.keyup, this)) + + if ($.browser.chrome || $.browser.webkit || $.browser.msie) { + this.$element.on('keydown', $.proxy(this.keydown, this)) + } + + this.$menu + .on('click', $.proxy(this.click, this)) + .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) + } + + , move: function (e) { + if (!this.shown) return + + switch(e.keyCode) { + case 9: // tab + case 13: // enter + case 27: // escape + e.preventDefault() + break + + case 38: // up arrow + e.preventDefault() + this.prev() + break + + case 40: // down arrow + e.preventDefault() + this.next() + break + } + + e.stopPropagation() + } + + , keydown: function (e) { + this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27]) + this.move(e) + } + + , keypress: function (e) { + if (this.suppressKeyPressRepeat) return + this.move(e) + } + + , keyup: function (e) { + switch(e.keyCode) { + case 40: // down arrow + case 38: // up arrow + break + + case 9: // tab + case 13: // enter + if (!this.shown) return + this.select() + break + + case 27: // escape + if (!this.shown) return + this.hide() + break + + default: + this.lookup() + } + + e.stopPropagation() + e.preventDefault() + } + + , blur: function (e) { + var that = this + setTimeout(function () { that.hide() }, 150) + } + + , click: function (e) { + e.stopPropagation() + e.preventDefault() + this.select() + } + + , mouseenter: function (e) { + this.$menu.find('.active').removeClass('active') + $(e.currentTarget).addClass('active') + } + + } + + + /* TYPEAHEAD PLUGIN DEFINITION + * =========================== */ + + $.fn.typeahead = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('typeahead') + , options = typeof option == 'object' && option + if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.typeahead.defaults = { + source: [] + , items: 8 + , menu: '
      ' + , item: '
      • ' + , minLength: 1 + } + + $.fn.typeahead.Constructor = Typeahead + + + /* TYPEAHEAD DATA-API + * ================== */ + + $(function () { + $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { + var $this = $(this) + if ($this.data('typeahead')) return + e.preventDefault() + $this.typeahead($this.data()) + }) + }) + +}(window.jQuery); +/* ========================================================== + * bootstrap-affix.js v2.1.1 + * http://twitter.github.com/bootstrap/javascript.html#affix + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* AFFIX CLASS DEFINITION + * ====================== */ + + var Affix = function (element, options) { + this.options = $.extend({}, $.fn.affix.defaults, options) + this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) + this.$element = $(element) + this.checkPosition() + } + + Affix.prototype.checkPosition = function () { + if (!this.$element.is(':visible')) return + + var scrollHeight = $(document).height() + , scrollTop = this.$window.scrollTop() + , position = this.$element.offset() + , offset = this.options.offset + , offsetBottom = offset.bottom + , offsetTop = offset.top + , reset = 'affix affix-top affix-bottom' + , affix + + if (typeof offset != 'object') offsetBottom = offsetTop = offset + if (typeof offsetTop == 'function') offsetTop = offset.top() + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() + + affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? + false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? + 'bottom' : offsetTop != null && scrollTop <= offsetTop ? + 'top' : false + + if (this.affixed === affix) return + + this.affixed = affix + this.unpin = affix == 'bottom' ? position.top - scrollTop : null + + this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) + } + + + /* AFFIX PLUGIN DEFINITION + * ======================= */ + + $.fn.affix = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('affix') + , options = typeof option == 'object' && option + if (!data) $this.data('affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.affix.Constructor = Affix + + $.fn.affix.defaults = { + offset: 0 + } + + + /* AFFIX DATA-API + * ============== */ + + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + , data = $spy.data() + + data.offset = data.offset || {} + + data.offsetBottom && (data.offset.bottom = data.offsetBottom) + data.offsetTop && (data.offset.top = data.offsetTop) + + $spy.affix(data) + }) + }) + + }(window.jQuery); \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/bootstrap-merged.less b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/bootstrap-merged.less similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/bootstrap-merged.less rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/bootstrap-merged.less index 77c4f7e..42a340a 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/bootstrap-merged.less +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/bootstrap-merged.less @@ -1,5148 +1,5148 @@ -/*! - * Bootstrap v2.1.1 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -// CSS Reset -// -// Modals -// Adapted from http://github.com/necolas/normalize.css -// -------------------------------------------------- - - -// Display in IE6-9 and FF3 -// ------------------------- - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} - -// Display block in IE6-9 and FF3 -// ------------------------- - -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} - -// Prevents modern browsers from displaying 'audio' without controls -// ------------------------- - -audio:not([controls]) { - display: none; -} - -// Base settings -// ------------------------- - -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -// Focus states -a:focus { - .tab-focus(); -} -// Hover & Active -a:hover, -a:active { - outline: 0; -} - -// Prevents sub and sup affecting line-height in all browsers -// ------------------------- - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} -sup { - top: -0.5em; -} -sub { - bottom: -0.25em; -} - -// Img border in a's and image quality -// ------------------------- - -img { - /* Responsive images (ensure images don't scale beyond their parents) */ - max-width: 100%; /* Part 1: Set a maxium relative to the parent */ - width: auto\9; /* IE7-8 need help adjusting responsive images */ - height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ - - vertical-align: middle; - border: 0; - -ms-interpolation-mode: bicubic; -} - -// Prevent max-width from affecting Google Maps -#map_canvas img { - max-width: none; -} - -// Forms -// ------------------------- - -// Font size in all browsers, margin changes, misc consistency -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} -button, -input { - *overflow: visible; // Inner spacing ie IE6/7 - line-height: normal; // FF3/4 have !important on line-height in UA stylesheet -} -button::-moz-focus-inner, -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 - padding: 0; - border: 0; -} -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; // Cursors on all buttons applied consistently - -webkit-appearance: button; // Style clickable inputs in iOS -} -input[type="search"] { // Appearance in Safari/Chrome - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 -} -textarea { - overflow: auto; // Remove vertical scrollbar in IE6-9 - vertical-align: top; // Readability and alignment cross-browser -} - -// Core variables and mixins -// -// Variables -// -------------------------------------------------- - - -// Global values -// -------------------------------------------------- - - -// Grays -// ------------------------- -@black: #000; -@grayDarker: #222; -@grayDark: #333; -@gray: #555; -@grayLight: #999; -@grayLighter: #eee; -@white: #fff; - - -// Accent colors -// ------------------------- -@blue: #049cdb; -@blueDark: #0064cd; -@green: #46a546; -@red: #9d261d; -@yellow: #ffc40d; -@orange: #f89406; -@pink: #c3325f; -@purple: #7a43b6; - - -// Scaffolding -// ------------------------- -@bodyBackground: @white; -@textColor: @grayDark; - - -// Links -// ------------------------- -@linkColor: #08c; -@linkColorHover: darken(@linkColor, 15%); - - -// Typography -// ------------------------- -@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; -@serifFontFamily: Georgia, "Times New Roman", Times, serif; -@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace; - -@baseFontSize: 14px; -@baseFontFamily: @sansFontFamily; -@baseLineHeight: 20px; -@altFontFamily: @serifFontFamily; - -@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -@headingsFontWeight: bold; // instead of browser default, bold -@headingsColor: inherit; // empty to use BS default, @textColor - -// Tables -// ------------------------- -@tableBackground: transparent; // overall background-color -@tableBackgroundAccent: #f9f9f9; // for striping -@tableBackgroundHover: #f5f5f5; // for hover -@tableBorder: #ddd; // table and cell border - -// Buttons -// ------------------------- -@btnBackground: @white; -@btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: #bbb; - -@btnPrimaryBackground: @linkColor; -@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); - -@btnInfoBackground: #5bc0de; -@btnInfoBackgroundHighlight: #2f96b4; - -@btnSuccessBackground: #62c462; -@btnSuccessBackgroundHighlight: #51a351; - -@btnWarningBackground: lighten(@orange, 15%); -@btnWarningBackgroundHighlight: @orange; - -@btnDangerBackground: #ee5f5b; -@btnDangerBackgroundHighlight: #bd362f; - -@btnInverseBackground: #444; -@btnInverseBackgroundHighlight: @grayDarker; - - -// Forms -// ------------------------- -@inputBackground: @white; -@inputBorder: #ccc; -@inputBorderRadius: 3px; -@inputDisabledBackground: @grayLighter; -@formActionsBackground: #f5f5f5; - -// Dropdowns -// ------------------------- -@dropdownBackground: @white; -@dropdownBorder: rgba(0,0,0,.2); -@dropdownDividerTop: #e5e5e5; -@dropdownDividerBottom: @white; - -@dropdownLinkColor: @grayDark; -@dropdownLinkColorHover: @white; -@dropdownLinkColorActive: @dropdownLinkColor; - -@dropdownLinkBackgroundActive: @linkColor; -@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; - - - -// COMPONENT VARIABLES -// -------------------------------------------------- - -// Z-index master list -// ------------------------- -// Used for a bird's eye view of components dependent on the z-axis -// Try to avoid customizing these :) -@zindexDropdown: 1000; -@zindexPopover: 1010; -@zindexTooltip: 1030; -@zindexFixedNavbar: 1030; -@zindexModalBackdrop: 1040; -@zindexModal: 1050; - - -// Sprite icons path -// ------------------------- -@iconSpritePath: "../img/glyphicons-halflings.png"; -@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; - - -// Input placeholder text color -// ------------------------- -@placeholderText: @grayLight; - - -// Hr border color -// ------------------------- -@hrBorder: @grayLighter; - - -// Horizontal forms & lists -// ------------------------- -@horizontalComponentOffset: 180px; - - -// Wells -// ------------------------- -@wellBackground: #f5f5f5; - - -// Navbar -// ------------------------- -@navbarCollapseWidth: 979px; - -@navbarHeight: 40px; -@navbarBackgroundHighlight: #ffffff; -@navbarBackground: darken(@navbarBackgroundHighlight, 5%); -@navbarBorder: darken(@navbarBackground, 12%); - -@navbarText: #777; -@navbarLinkColor: #777; -@navbarLinkColorHover: @grayDark; -@navbarLinkColorActive: @gray; -@navbarLinkBackgroundHover: transparent; -@navbarLinkBackgroundActive: darken(@navbarBackground, 5%); - -@navbarBrandColor: @navbarLinkColor; - -// Inverted navbar -@navbarInverseBackground: #111111; -@navbarInverseBackgroundHighlight: #222222; -@navbarInverseBorder: #252525; - -@navbarInverseText: @grayLight; -@navbarInverseLinkColor: @grayLight; -@navbarInverseLinkColorHover: @white; -@navbarInverseLinkColorActive: @navbarInverseLinkColorHover; -@navbarInverseLinkBackgroundHover: transparent; -@navbarInverseLinkBackgroundActive: @navbarInverseBackground; - -@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%); -@navbarInverseSearchBackgroundFocus: @white; -@navbarInverseSearchBorder: @navbarInverseBackground; -@navbarInverseSearchPlaceholderColor: #ccc; - -@navbarInverseBrandColor: @navbarInverseLinkColor; - - -// Pagination -// ------------------------- -@paginationBackground: #fff; -@paginationBorder: #ddd; -@paginationActiveBackground: #f5f5f5; - - -// Hero unit -// ------------------------- -@heroUnitBackground: @grayLighter; -@heroUnitHeadingColor: inherit; -@heroUnitLeadColor: inherit; - - -// Form states and alerts -// ------------------------- -@warningText: #c09853; -@warningBackground: #fcf8e3; -@warningBorder: darken(spin(@warningBackground, -10), 3%); - -@errorText: #b94a48; -@errorBackground: #f2dede; -@errorBorder: darken(spin(@errorBackground, -10), 3%); - -@successText: #468847; -@successBackground: #dff0d8; -@successBorder: darken(spin(@successBackground, -10), 5%); - -@infoText: #3a87ad; -@infoBackground: #d9edf7; -@infoBorder: darken(spin(@infoBackground, -10), 7%); - - -// Tooltips and popovers -// ------------------------- -@tooltipColor: #fff; -@tooltipBackground: #000; -@tooltipArrowWidth: 5px; -@tooltipArrowColor: @tooltipBackground; - -@popoverBackground: #fff; -@popoverArrowWidth: 10px; -@popoverArrowColor: #fff; -@popoverTitleBackground: darken(@popoverBackground, 3%); - -// Special enhancement for popovers -@popoverArrowOuterWidth: @popoverArrowWidth + 1; -@popoverArrowOuterColor: rgba(0,0,0,.25); - - - -// GRID -// -------------------------------------------------- - - -// Default 940px grid -// ------------------------- -@gridColumns: 12; -@gridColumnWidth: 60px; -@gridGutterWidth: 20px; -@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); - -// 1200px min -@gridColumnWidth1200: 70px; -@gridGutterWidth1200: 30px; -@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1)); - -// 768px-979px -@gridColumnWidth768: 42px; -@gridGutterWidth768: 20px; -@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1)); - - -// Fluid grid -// ------------------------- -@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth); -@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth); - -// 1200px min -@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200); -@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200); - -// 768px-979px -@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768); -@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768); -// -// Mixins -// -------------------------------------------------- - - -// UTILITY MIXINS -// -------------------------------------------------- - -// Clearfix -// -------- -// For clearing floats like a boss h5bp.com/q -.clearfix { - *zoom: 1; - &:before, - &:after { - display: table; - content: ""; - // Fixes Opera/contenteditable bug: - // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952 - line-height: 0; - } - &:after { - clear: both; - } -} - -// Webkit-style focus -// ------------------ -.tab-focus() { - // Default - outline: thin dotted #333; - // Webkit - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -// Center-align a block level element -// ---------------------------------- -.center-block() { - display: block; - margin-left: auto; - margin-right: auto; -} - -// IE7 inline-block -// ---------------- -.ie7-inline-block() { - *display: inline; /* IE7 inline-block hack */ - *zoom: 1; -} - -// IE7 likes to collapse whitespace on either side of the inline-block elements. -// Ems because we're attempting to match the width of a space character. Left -// version is for form buttons, which typically come after other elements, and -// right version is for icons, which come before. Applying both is ok, but it will -// mean that space between those elements will be .6em (~2 space characters) in IE7, -// instead of the 1 space in other browsers. -.ie7-restore-left-whitespace() { - *margin-left: .3em; - - &:first-child { - *margin-left: 0; - } -} - -.ie7-restore-right-whitespace() { - *margin-right: .3em; -} - -// Sizing shortcuts -// ------------------------- -.size(@height, @width) { - width: @width; - height: @height; -} -.square(@size) { - .size(@size, @size); -} - -// Placeholder text -// ------------------------- -.placeholder(@color: @placeholderText) { - &:-moz-placeholder { - color: @color; - } - &:-ms-input-placeholder { - color: @color; - } - &::-webkit-input-placeholder { - color: @color; - } -} - -// Text overflow -// ------------------------- -// Requires inline-block or block for proper styling -.text-overflow() { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -// CSS image replacement -// ------------------------- -// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - - -// FONTS -// -------------------------------------------------- - -#font { - #family { - .serif() { - font-family: @serifFontFamily; - } - .sans-serif() { - font-family: @sansFontFamily; - } - .monospace() { - font-family: @monoFontFamily; - } - } - .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { - font-size: @size; - font-weight: @weight; - line-height: @lineHeight; - } - .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { - #font > #family > .serif; - #font > .shorthand(@size, @weight, @lineHeight); - } - .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { - #font > #family > .sans-serif; - #font > .shorthand(@size, @weight, @lineHeight); - } - .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { - #font > #family > .monospace; - #font > .shorthand(@size, @weight, @lineHeight); - } -} - - -// FORMS -// -------------------------------------------------- - -// Block level inputs -.input-block-level { - display: block; - width: 100%; - min-height: 30px; // Make inputs at least the height of their button counterpart - .box-sizing(border-box); // Makes inputs behave like true block-level elements -} - - - -// Mixin for form field states -.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { - // Set the text color - > label, - .help-block, - .help-inline { - color: @textColor; - } - // Style inputs accordingly - .checkbox, - .radio, - input, - select, - textarea { - color: @textColor; - } - input, - select, - textarea { - border-color: @borderColor; - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work - &:focus { - border-color: darken(@borderColor, 10%); - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%)); - } - } - // Give a small background color for input-prepend/-append - .input-prepend .add-on, - .input-append .add-on { - color: @textColor; - background-color: @backgroundColor; - border-color: @textColor; - } -} - - - -// CSS3 PROPERTIES -// -------------------------------------------------- - -// Border Radius -.border-radius(@radius) { - -webkit-border-radius: @radius; - -moz-border-radius: @radius; - border-radius: @radius; -} - -// Single Corner Border Radius -.border-top-left-radius(@radius) { - -webkit-border-top-left-radius: @radius; - -moz-border-radius-topleft: @radius; - border-top-left-radius: @radius; -} -.border-top-right-radius(@radius) { - -webkit-border-top-right-radius: @radius; - -moz-border-radius-topright: @radius; - border-top-right-radius: @radius; -} -.border-bottom-right-radius(@radius) { - -webkit-border-bottom-right-radius: @radius; - -moz-border-radius-bottomright: @radius; - border-bottom-right-radius: @radius; -} -.border-bottom-left-radius(@radius) { - -webkit-border-bottom-left-radius: @radius; - -moz-border-radius-bottomleft: @radius; - border-bottom-left-radius: @radius; -} - -// Single Side Border Radius -.border-top-radius(@radius) { - .border-top-right-radius(@radius); - .border-top-left-radius(@radius); -} -.border-right-radius(@radius) { - .border-top-right-radius(@radius); - .border-bottom-right-radius(@radius); -} -.border-bottom-radius(@radius) { - .border-bottom-right-radius(@radius); - .border-bottom-left-radius(@radius); -} -.border-left-radius(@radius) { - .border-top-left-radius(@radius); - .border-bottom-left-radius(@radius); -} - -// Drop shadows -.box-shadow(@shadowA, @shadowB:X, ...){ - // Multiple shadow solution from http://toekneestuck.com/blog/2012/05/15/less-css-arguments-variable/ - @props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`; - -webkit-box-shadow: @props; - -moz-box-shadow: @props; - box-shadow: @props; -} - -// Transitions -.transition(@transition) { - -webkit-transition: @transition; - -moz-transition: @transition; - -o-transition: @transition; - transition: @transition; -} -.transition-delay(@transition-delay) { - -webkit-transition-delay: @transition-delay; - -moz-transition-delay: @transition-delay; - -o-transition-delay: @transition-delay; - transition-delay: @transition-delay; -} - -// Transformations -.rotate(@degrees) { - -webkit-transform: rotate(@degrees); - -moz-transform: rotate(@degrees); - -ms-transform: rotate(@degrees); - -o-transform: rotate(@degrees); - transform: rotate(@degrees); -} -.scale(@ratio) { - -webkit-transform: scale(@ratio); - -moz-transform: scale(@ratio); - -ms-transform: scale(@ratio); - -o-transform: scale(@ratio); - transform: scale(@ratio); -} -.translate(@x, @y) { - -webkit-transform: translate(@x, @y); - -moz-transform: translate(@x, @y); - -ms-transform: translate(@x, @y); - -o-transform: translate(@x, @y); - transform: translate(@x, @y); -} -.skew(@x, @y) { - -webkit-transform: skew(@x, @y); - -moz-transform: skew(@x, @y); - -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885 - -o-transform: skew(@x, @y); - transform: skew(@x, @y); -} -.translate3d(@x, @y, @z) { - -webkit-transform: translate3d(@x, @y, @z); - -moz-transform: translate3d(@x, @y, @z); - -o-transform: translate3d(@x, @y, @z); - transform: translate3d(@x, @y, @z); -} - -// Backface visibility -// Prevent browsers from flickering when using CSS 3D transforms. -// Default value is `visible`, but can be changed to `hidden -// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples -.backface-visibility(@visibility){ - -webkit-backface-visibility: @visibility; - -moz-backface-visibility: @visibility; - backface-visibility: @visibility; -} - -// Background clipping -// Heads up: FF 3.6 and under need "padding" instead of "padding-box" -.background-clip(@clip) { - -webkit-background-clip: @clip; - -moz-background-clip: @clip; - background-clip: @clip; -} - -// Background sizing -.background-size(@size){ - -webkit-background-size: @size; - -moz-background-size: @size; - -o-background-size: @size; - background-size: @size; -} - - -// Box sizing -.box-sizing(@boxmodel) { - -webkit-box-sizing: @boxmodel; - -moz-box-sizing: @boxmodel; - box-sizing: @boxmodel; -} - -// User select -// For selecting text on the page -.user-select(@select) { - -webkit-user-select: @select; - -moz-user-select: @select; - -ms-user-select: @select; - -o-user-select: @select; - user-select: @select; -} - -// Resize anything -.resizable(@direction) { - resize: @direction; // Options: horizontal, vertical, both - overflow: auto; // Safari fix -} - -// CSS3 Content Columns -.content-columns(@columnCount, @columnGap: @gridGutterWidth) { - -webkit-column-count: @columnCount; - -moz-column-count: @columnCount; - column-count: @columnCount; - -webkit-column-gap: @columnGap; - -moz-column-gap: @columnGap; - column-gap: @columnGap; -} - -// Optional hyphenation -.hyphens(@mode: auto) { - word-wrap: break-word; - -webkit-hyphens: @mode; - -moz-hyphens: @mode; - -ms-hyphens: @mode; - -o-hyphens: @mode; - hyphens: @mode; -} - -// Opacity -.opacity(@opacity) { - opacity: @opacity / 100; - filter: ~"alpha(opacity=@{opacity})"; -} - - - -// BACKGROUNDS -// -------------------------------------------------- - -// Add an alphatransparency value to any background or border color (via Elyse Holladay) -#translucent { - .background(@color: @white, @alpha: 1) { - background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); - } - .border(@color: @white, @alpha: 1) { - border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); - .background-clip(padding-box); - } -} - -// Gradient Bar Colors for buttons and alerts -.gradientBar(@primaryColor, @secondaryColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) { - color: @textColor; - text-shadow: @textShadow; - #gradient > .vertical(@primaryColor, @secondaryColor); - border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); -} - -// Gradients -#gradient { - .horizontal(@startColor: #555, @endColor: #333) { - background-color: @endColor; - background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ - background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10 - background-repeat: repeat-x; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down - } - .vertical(@startColor: #555, @endColor: #333) { - background-color: mix(@startColor, @endColor, 60%); - background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 - background-repeat: repeat-x; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down - } - .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { - background-color: @endColor; - background-repeat: repeat-x; - background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ - background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10 - } - .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { - background-color: mix(@midColor, @endColor, 80%); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); - background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); - background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-repeat: no-repeat; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback - } - .radial(@innerColor: #555, @outerColor: #333) { - background-color: @outerColor; - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); - background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); - background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); - background-image: -o-radial-gradient(circle, @innerColor, @outerColor); - background-repeat: no-repeat; - } - .striped(@color: #555, @angle: 45deg) { - background-color: @color; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - } -} -// Reset filters for IE -.reset-filter() { - filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)")); -} - - - -// COMPONENT MIXINS -// -------------------------------------------------- - -// Horizontal dividers -// ------------------------- -// Dividers (basically an hr) within dropdowns and nav lists -.nav-divider(@top: #e5e5e5, @bottom: @white) { - // IE7 needs a set width since we gave a height. Restricting just - // to IE7 to keep the 1px left/right space in other browsers. - // It is unclear where IE is getting the extra space that we need - // to negative-margin away, but so it goes. - *width: 100%; - height: 1px; - margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px - *margin: -5px 0 5px; - overflow: hidden; - background-color: @top; - border-bottom: 1px solid @bottom; -} - -// Button backgrounds -// ------------------ -.buttonBackground(@startColor, @endColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) { - // gradientBar will set the background to a pleasing blend of these, to support IE<=9 - .gradientBar(@startColor, @endColor, @textColor, @textShadow); - *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - .reset-filter(); - - // in these cases the gradient won't cover the background, so we override - &:hover, &:active, &.active, &.disabled, &[disabled] { - color: @textColor; - background-color: @endColor; - *background-color: darken(@endColor, 5%); - } - - // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves - &:active, - &.active { - background-color: darken(@endColor, 10%) e("\9"); - } -} - -// Navbar vertical align -// ------------------------- -// Vertically center elements in the navbar. -// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin. -.navbarVerticalAlign(@elementHeight) { - margin-top: (@navbarHeight - @elementHeight) / 2; -} - - - -// Grid System -// ----------- - -// Centered container element -.container-fixed() { - margin-right: auto; - margin-left: auto; - .clearfix(); -} - -// Table columns -.tableColumns(@columnSpan: 1) { - float: none; // undo default grid column styles - width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells - margin-left: 0; // undo default grid column styles -} - -// Make a Grid -// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior -.makeRow() { - margin-left: @gridGutterWidth * -1; - .clearfix(); -} -.makeColumn(@columns: 1, @offset: 0) { - float: left; - margin-left: (@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2); - width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); -} - -// The Grid -#grid { - - .core (@gridColumnWidth, @gridGutterWidth) { - - .spanX (@index) when (@index > 0) { - (~".span@{index}") { .span(@index); } - .spanX(@index - 1); - } - .spanX (0) {} - - .offsetX (@index) when (@index > 0) { - (~".offset@{index}") { .offset(@index); } - .offsetX(@index - 1); - } - .offsetX (0) {} - - .offset (@columns) { - margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1)); - } - - .span (@columns) { - width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); - } - - .row { - margin-left: @gridGutterWidth * -1; - .clearfix(); - } - - [class*="span"] { - float: left; - min-height: 1px; // prevent collapsing columns - margin-left: @gridGutterWidth; - } - - // Set the container width, and override it for fixed navbars in media queries - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { .span(@gridColumns); } - - // generate .spanX and .offsetX - .spanX (@gridColumns); - .offsetX (@gridColumns); - - } - - .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) { - - .spanX (@index) when (@index > 0) { - (~".span@{index}") { .span(@index); } - .spanX(@index - 1); - } - .spanX (0) {} - - .offsetX (@index) when (@index > 0) { - (~'.offset@{index}') { .offset(@index); } - (~'.offset@{index}:first-child') { .offsetFirstChild(@index); } - .offsetX(@index - 1); - } - .offsetX (0) {} - - .offset (@columns) { - margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2); - *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%); - } - - .offsetFirstChild (@columns) { - margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth); - *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%); - } - - .span (@columns) { - width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)); - *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%); - } - - .row-fluid { - width: 100%; - .clearfix(); - [class*="span"] { - .input-block-level(); - float: left; - margin-left: @fluidGridGutterWidth; - *margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%); - } - [class*="span"]:first-child { - margin-left: 0; - } - - // generate .spanX and .offsetX - .spanX (@gridColumns); - .offsetX (@gridColumns); - } - - } - - .input(@gridColumnWidth, @gridGutterWidth) { - - .spanX (@index) when (@index > 0) { - (~"input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index}") { .span(@index); } - .spanX(@index - 1); - } - .spanX (0) {} - - .span(@columns) { - width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 14; - } - - input, - textarea, - .uneditable-input { - margin-left: 0; // override margin-left from core grid system - } - - // Space grid-sized controls properly if multiple per line - .controls-row [class*="span"] + [class*="span"] { - margin-left: @gridGutterWidth; - } - - // generate .spanX - .spanX (@gridColumns); - - } - -} - -// Grid system and page structure -// -// Scaffolding -// -------------------------------------------------- - - -// Body reset -// ------------------------- - -body { - margin: 0; - font-family: @baseFontFamily; - font-size: @baseFontSize; - line-height: @baseLineHeight; - color: @textColor; - background-color: @bodyBackground; -} - - -// Links -// ------------------------- - -a { - color: @linkColor; - text-decoration: none; -} -a:hover { - color: @linkColorHover; - text-decoration: underline; -} - - -// Images -// ------------------------- - -// Rounded corners -.img-rounded { - .border-radius(6px); -} - -// Add polaroid-esque trim -.img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0,0,0,.2); - .box-shadow(0 1px 3px rgba(0,0,0,.1)); -} - -// Perfect circle -.img-circle { - .border-radius(500px); // crank the border-radius so it works with most reasonably sized images -} -// -// Grid system -// -------------------------------------------------- - - -// Fixed (940px) -#grid > .core(@gridColumnWidth, @gridGutterWidth); - -// Fluid (940px) -#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth); - -// Reset utility classes due to specificity -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; -} - -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; -} -// -// Layouts -// -------------------------------------------------- - - -// Container (centered, fixed-width layouts) -.container { - .container-fixed(); -} - -// Fluid layouts (left aligned, with sidebar, min- & max-width content) -.container-fluid { - padding-right: @gridGutterWidth; - padding-left: @gridGutterWidth; - .clearfix(); -} -// Base CSS -// -// Typography -// -------------------------------------------------- - - -// Body text -// ------------------------- - -p { - margin: 0 0 @baseLineHeight / 2; -} -.lead { - margin-bottom: @baseLineHeight; - font-size: @baseFontSize * 1.5; - font-weight: 200; - line-height: @baseLineHeight * 1.5; -} - - -// Emphasis & misc -// ------------------------- - -small { - font-size: 85%; // Ex: 14px base font * 85% = about 12px -} -strong { - font-weight: bold; -} -em { - font-style: italic; -} -cite { - font-style: normal; -} - -// Utility classes -.muted { - color: @grayLight; -} -.text-warning { - color: @warningText; -} -.text-error { - color: @errorText; -} -.text-info { - color: @infoText; -} -.text-success { - color: @successText; -} - - -// Headings -// ------------------------- - -h1, h2, h3, h4, h5, h6 { - margin: (@baseLineHeight / 2) 0; - font-family: @headingsFontFamily; - font-weight: @headingsFontWeight; - line-height: 1; - color: @headingsColor; - text-rendering: optimizelegibility; // Fix the character spacing for headings - small { - font-weight: normal; - line-height: 1; - color: @grayLight; - } -} -h1 { font-size: 36px; line-height: 40px; } -h2 { font-size: 30px; line-height: 40px; } -h3 { font-size: 24px; line-height: 40px; } -h4 { font-size: 18px; line-height: 20px; } -h5 { font-size: 14px; line-height: 20px; } -h6 { font-size: 12px; line-height: 20px; } - -h1 small { font-size: 24px; } -h2 small { font-size: 18px; } -h3 small { font-size: 14px; } -h4 small { font-size: 14px; } - - -// Page header -// ------------------------- - -.page-header { - padding-bottom: (@baseLineHeight / 2) - 1; - margin: @baseLineHeight 0 (@baseLineHeight * 1.5); - border-bottom: 1px solid @grayLighter; -} - - - -// Lists -// -------------------------------------------------- - -// Unordered and Ordered lists -ul, ol { - padding: 0; - margin: 0 0 @baseLineHeight / 2 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -li { - line-height: @baseLineHeight; -} -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} - -// Description Lists -dl { - margin-bottom: @baseLineHeight; -} -dt, -dd { - line-height: @baseLineHeight; -} -dt { - font-weight: bold; -} -dd { - margin-left: @baseLineHeight / 2; -} -// Horizontal layout (like forms) -.dl-horizontal { - .clearfix(); // Ensure dl clears floats if empty dd elements present - dt { - float: left; - width: @horizontalComponentOffset - 20; - clear: left; - text-align: right; - .text-overflow(); - } - dd { - margin-left: @horizontalComponentOffset; - } -} - -// MISC -// ---- - -// Horizontal rules -hr { - margin: @baseLineHeight 0; - border: 0; - border-top: 1px solid @hrBorder; - border-bottom: 1px solid @white; -} - -// Abbreviations and acronyms -abbr[title] { - cursor: help; - border-bottom: 1px dotted @grayLight; -} -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -// Blockquotes -blockquote { - padding: 0 0 0 15px; - margin: 0 0 @baseLineHeight; - border-left: 5px solid @grayLighter; - p { - margin-bottom: 0; - #font > .shorthand(16px,300,@baseLineHeight * 1.25); - } - small { - display: block; - line-height: @baseLineHeight; - color: @grayLight; - &:before { - content: '\2014 \00A0'; - } - } - - // Float right with text-align: right - &.pull-right { - float: right; - padding-right: 15px; - padding-left: 0; - border-right: 5px solid @grayLighter; - border-left: 0; - p, - small { - text-align: right; - } - small { - &:before { - content: ''; - } - &:after { - content: '\00A0 \2014'; - } - } - } -} - -// Quotes -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -// Addresses -address { - display: block; - margin-bottom: @baseLineHeight; - font-style: normal; - line-height: @baseLineHeight; -} -// -// Code (inline and blocK) -// -------------------------------------------------- - - -// Inline and block code styles -code, -pre { - padding: 0 3px 2px; - #font > #family > .monospace; - font-size: @baseFontSize - 2; - color: @grayDark; - .border-radius(3px); -} - -// Inline code -code { - padding: 2px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} - -// Blocks of code -pre { - display: block; - padding: (@baseLineHeight - 1) / 2; - margin: 0 0 @baseLineHeight / 2; - font-size: @baseFontSize - 1; // 14px to 13px - line-height: @baseLineHeight; - word-break: break-all; - word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; - background-color: #f5f5f5; - border: 1px solid #ccc; // fallback for IE7-8 - border: 1px solid rgba(0,0,0,.15); - .border-radius(4px); - - // Make prettyprint styles more spaced out for readability - &.prettyprint { - margin-bottom: @baseLineHeight; - } - - // Account for some code outputs that place code tags in pre tags - code { - padding: 0; - color: inherit; - background-color: transparent; - border: 0; - } -} - -// Enable scrollable blocks of code -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} // -// Forms -// -------------------------------------------------- - - -// GENERAL STYLES -// -------------- - -// Make all forms have space below them -form { - margin: 0 0 @baseLineHeight; -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -// Groups of fields with labels on top (legends) -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: @baseLineHeight; - font-size: @baseFontSize * 1.5; - line-height: @baseLineHeight * 2; - color: @grayDark; - border: 0; - border-bottom: 1px solid #e5e5e5; - - // Small - small { - font-size: @baseLineHeight * .75; - color: @grayLight; - } -} - -// Set font for forms -label, -input, -button, -select, -textarea { - #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here -} -input, -button, -select, -textarea { - font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element) -} - -// Identify controls by their labels -label { - display: block; - margin-bottom: 5px; -} - -// Form controls -// ------------------------- - -// Shared size and type resets -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - display: inline-block; - height: @baseLineHeight; - padding: 4px 6px; - margin-bottom: 9px; - font-size: @baseFontSize; - line-height: @baseLineHeight; - color: @gray; - .border-radius(@inputBorderRadius); -} - -// Reset appearance properties for textual inputs and textarea -// Declare width for legacy (can't be on input[type=*] selectors or it's too specific) -input, -textarea, -.uneditable-input { - width: 206px; // plus 12px padding and 2px border -} -// Reset height since textareas have rows -textarea { - height: auto; -} -// Everything else -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input { - background-color: @inputBackground; - border: 1px solid @inputBorder; - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); - .transition(~"border linear .2s, box-shadow linear .2s"); - - // Focus state - &:focus { - border-color: rgba(82,168,236,.8); - outline: 0; - outline: thin dotted \9; /* IE6-9 */ - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)); - } -} - -// Position radios and checkboxes better -input[type="radio"], -input[type="checkbox"] { - margin: 4px 0 0; - *margin-top: 0; /* IE7 */ - margin-top: 1px \9; /* IE8-9 */ - line-height: normal; - cursor: pointer; -} - -// Reset width of input images, buttons, radios, checkboxes -input[type="file"], -input[type="image"], -input[type="submit"], -input[type="reset"], -input[type="button"], -input[type="radio"], -input[type="checkbox"] { - width: auto; // Override of generic input selector -} - -// Set the height of select and file controls to match text inputs -select, -input[type="file"] { - height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ - *margin-top: 4px; /* For IE7, add top margin to align select with labels */ - line-height: 30px; -} - -// Make select elements obey height by applying a border -select { - width: 220px; // default input width + 10px of padding that doesn't get applied - border: 1px solid @inputBorder; - background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color -} - -// Make multiple select elements height not fixed -select[multiple], -select[size] { - height: auto; -} - -// Focus for select, file, radio, and checkbox -select:focus, -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - .tab-focus(); -} - - -// Uneditable inputs -// ------------------------- - -// Make uneditable inputs look inactive -.uneditable-input, -.uneditable-textarea { - color: @grayLight; - background-color: darken(@inputBackground, 1%); - border-color: @inputBorder; - .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); - cursor: not-allowed; -} - -// For text that needs to appear as an input but should not be an input -.uneditable-input { - overflow: hidden; // prevent text from wrapping, but still cut it off like an input does - white-space: nowrap; -} - -// Make uneditable textareas behave like a textarea -.uneditable-textarea { - width: auto; - height: auto; -} - - -// Placeholder -// ------------------------- - -// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector -input, -textarea { - .placeholder(); -} - - -// CHECKBOXES & RADIOS -// ------------------- - -// Indent the labels to position radios/checkboxes as hanging -.radio, -.checkbox { - min-height: 18px; // clear the floating input if there is no label text - padding-left: 18px; -} -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -18px; -} - -// Move the options list down to align with labels -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; // has to be padding because margin collaspes -} - -// Radios and checkboxes on same line -// TODO v3: Convert .inline to .control-inline -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; // space out consecutive inline controls -} - - - -// INPUT SIZES -// ----------- - -// General classes for quick sizes -.input-mini { width: 60px; } -.input-small { width: 90px; } -.input-medium { width: 150px; } -.input-large { width: 210px; } -.input-xlarge { width: 270px; } -.input-xxlarge { width: 530px; } - -// Grid style input sizes -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input[class*="span"], -// Redeclare since the fluid row class is more specific -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; -} -// Ensure input-prepend/append never wraps -.input-append input[class*="span"], -.input-append .uneditable-input[class*="span"], -.input-prepend input[class*="span"], -.input-prepend .uneditable-input[class*="span"], -.row-fluid input[class*="span"], -.row-fluid select[class*="span"], -.row-fluid textarea[class*="span"], -.row-fluid .uneditable-input[class*="span"], -.row-fluid .input-prepend [class*="span"], -.row-fluid .input-append [class*="span"] { - display: inline-block; -} - - - -// GRID SIZING FOR INPUTS -// ---------------------- - -// Grid sizes -#grid > .input(@gridColumnWidth, @gridGutterWidth); - -// Control row for multiple inputs per line -.controls-row { - .clearfix(); // Clear the float from controls -} -.controls-row [class*="span"] { - float: left; // Float to collapse white-space for proper grid alignment -} - - - - -// DISABLED STATE -// -------------- - -// Disabled and read-only inputs -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - cursor: not-allowed; - background-color: @inputDisabledBackground; -} -// Explicitly reset the colors here -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly] { - background-color: transparent; -} - - - - -// FORM FIELD FEEDBACK STATES -// -------------------------- - -// Warning -.control-group.warning { - .formFieldState(@warningText, @warningText, @warningBackground); -} -// Error -.control-group.error { - .formFieldState(@errorText, @errorText, @errorBackground); -} -// Success -.control-group.success { - .formFieldState(@successText, @successText, @successBackground); -} -// Success -.control-group.info { - .formFieldState(@infoText, @infoText, @infoBackground); -} - -// HTML5 invalid states -// Shares styles with the .control-group.error above -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { - color: #b94a48; - border-color: #ee5f5b; - &:focus { - border-color: darken(#ee5f5b, 10%); - .box-shadow(0 0 6px lighten(#ee5f5b, 20%)); - } -} - - - -// FORM ACTIONS -// ------------ - -.form-actions { - padding: (@baseLineHeight - 1) 20px @baseLineHeight; - margin-top: @baseLineHeight; - margin-bottom: @baseLineHeight; - background-color: @formActionsBackground; - border-top: 1px solid #e5e5e5; - .clearfix(); // Adding clearfix to allow for .pull-right button containers -} - - - -// HELP TEXT -// --------- - -.help-block, -.help-inline { - color: lighten(@textColor, 15%); // lighten the text some for contrast -} - -.help-block { - display: block; // account for any element using help-block - margin-bottom: @baseLineHeight / 2; -} - -.help-inline { - display: inline-block; - .ie7-inline-block(); - vertical-align: middle; - padding-left: 5px; -} - - - -// INPUT GROUPS -// ------------ - -// Allow us to put symbols and text within the input field for a cleaner look -.input-append, -.input-prepend { - margin-bottom: 5px; - font-size: 0; - white-space: nowrap; // Prevent span and input from separating - - input, - select, - .uneditable-input { - position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness - margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms - *margin-left: 0; - font-size: @baseFontSize; - vertical-align: top; - .border-radius(0 @inputBorderRadius @inputBorderRadius 0); - // Make input on top when focused so blue border and shadow always show - &:focus { - z-index: 2; - } - } - .add-on { - display: inline-block; - width: auto; - height: @baseLineHeight; - min-width: 16px; - padding: 4px 5px; - font-size: @baseFontSize; - font-weight: normal; - line-height: @baseLineHeight; - text-align: center; - text-shadow: 0 1px 0 @white; - background-color: @grayLighter; - border: 1px solid #ccc; - } - .add-on, - .btn { - vertical-align: top; - .border-radius(0); - } - .active { - background-color: lighten(@green, 30); - border-color: @green; - } -} -.input-prepend { - .add-on, - .btn { - margin-right: -1px; - } - .add-on:first-child, - .btn:first-child { - .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); - } -} -.input-append { - input, - select, - .uneditable-input { - .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); - } - .add-on, - .btn { - margin-left: -1px; - } - .add-on:last-child, - .btn:last-child { - .border-radius(0 @inputBorderRadius @inputBorderRadius 0); - } -} -// Remove all border-radius for inputs with both prepend and append -.input-prepend.input-append { - input, - select, - .uneditable-input { - .border-radius(0); - } - .add-on:first-child, - .btn:first-child { - margin-right: -1px; - .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); - } - .add-on:last-child, - .btn:last-child { - margin-left: -1px; - .border-radius(0 @inputBorderRadius @inputBorderRadius 0); - } -} - - - -// SEARCH FORM -// ----------- - -input.search-query { - padding-right: 14px; - padding-right: 4px \9; - padding-left: 14px; - padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ - margin-bottom: 0; // Remove the default margin on all inputs - .border-radius(15px); -} - -/* Allow for input prepend/append in search forms */ -.form-search .input-append .search-query, -.form-search .input-prepend .search-query { - .border-radius(0); // Override due to specificity -} -.form-search .input-append .search-query { - .border-radius(14px 0 0 14px); -} -.form-search .input-append .btn { - .border-radius(0 14px 14px 0); -} -.form-search .input-prepend .search-query { - .border-radius(0 14px 14px 0); -} -.form-search .input-prepend .btn { - .border-radius(14px 0 0 14px); -} - - - - -// HORIZONTAL & VERTICAL FORMS -// --------------------------- - -// Common properties -// ----------------- - -.form-search, -.form-inline, -.form-horizontal { - input, - textarea, - select, - .help-inline, - .uneditable-input, - .input-prepend, - .input-append { - display: inline-block; - .ie7-inline-block(); - margin-bottom: 0; - vertical-align: middle; - } - // Re-hide hidden elements due to specifity - .hide { - display: none; - } -} -.form-search label, -.form-inline label, -.form-search .btn-group, -.form-inline .btn-group { - display: inline-block; -} -// Remove margin for input-prepend/-append -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} -// Inline checkbox/radio labels (remove padding on left) -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} -// Remove float and margin, set to inline-block -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-right: 3px; - margin-left: 0; -} - - -// Margin to space out fieldsets -.control-group { - margin-bottom: @baseLineHeight / 2; -} - -// Legend collapses margin, so next element is responsible for spacing -legend + .control-group { - margin-top: @baseLineHeight; - -webkit-margin-top-collapse: separate; -} - -// Horizontal-specific styles -// -------------------------- - -.form-horizontal { - // Increase spacing between groups - .control-group { - margin-bottom: @baseLineHeight; - .clearfix(); - } - // Float the labels left - .control-label { - float: left; - width: @horizontalComponentOffset - 20; - padding-top: 5px; - text-align: right; - } - // Move over all input controls and content - .controls { - // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend - // don't inherit the margin of the parent, in this case .controls - *display: inline-block; - *padding-left: 20px; - margin-left: @horizontalComponentOffset; - *margin-left: 0; - &:first-child { - *padding-left: @horizontalComponentOffset; - } - } - // Remove bottom margin on block level help text since that's accounted for on .control-group - .help-block { - margin-bottom: 0; - } - // And apply it only to .help-block instances that follow a form control - input, - select, - textarea { - + .help-block { - margin-top: @baseLineHeight / 2; - } - } - // Move over buttons in .form-actions to align with .controls - .form-actions { - padding-left: @horizontalComponentOffset; - } -} -// -// Tables -// -------------------------------------------------- - - -// BASE TABLES -// ----------------- - -table { - max-width: 100%; - background-color: @tableBackground; - border-collapse: collapse; - border-spacing: 0; -} - -// BASELINE STYLES -// --------------- - -.table { - width: 100%; - margin-bottom: @baseLineHeight; - // Cells - th, - td { - padding: 8px; - line-height: @baseLineHeight; - text-align: left; - vertical-align: top; - border-top: 1px solid @tableBorder; - } - th { - font-weight: bold; - } - // Bottom align for column headings - thead th { - vertical-align: bottom; - } - // Remove top border from thead by default - caption + thead tr:first-child th, - caption + thead tr:first-child td, - colgroup + thead tr:first-child th, - colgroup + thead tr:first-child td, - thead:first-child tr:first-child th, - thead:first-child tr:first-child td { - border-top: 0; - } - // Account for multiple tbody instances - tbody + tbody { - border-top: 2px solid @tableBorder; - } -} - - - -// CONDENSED TABLE W/ HALF PADDING -// ------------------------------- - -.table-condensed { - th, - td { - padding: 4px 5px; - } -} - - -// BORDERED VERSION -// ---------------- - -.table-bordered { - border: 1px solid @tableBorder; - border-collapse: separate; // Done so we can round those corners! - *border-collapse: collapse; // IE7 can't round corners anyway - border-left: 0; - .border-radius(4px); - th, - td { - border-left: 1px solid @tableBorder; - } - // Prevent a double border - caption + thead tr:first-child th, - caption + tbody tr:first-child th, - caption + tbody tr:first-child td, - colgroup + thead tr:first-child th, - colgroup + tbody tr:first-child th, - colgroup + tbody tr:first-child td, - thead:first-child tr:first-child th, - tbody:first-child tr:first-child th, - tbody:first-child tr:first-child td { - border-top: 0; - } - // For first th or td in the first row in the first thead or tbody - thead:first-child tr:first-child th:first-child, - tbody:first-child tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - } - thead:first-child tr:first-child th:last-child, - tbody:first-child tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - } - // For first th or td in the first row in the first thead or tbody - thead:last-child tr:last-child th:first-child, - tbody:last-child tr:last-child td:first-child, - tfoot:last-child tr:last-child td:first-child { - .border-radius(0 0 0 4px); - -webkit-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - } - thead:last-child tr:last-child th:last-child, - tbody:last-child tr:last-child td:last-child, - tfoot:last-child tr:last-child td:last-child { - -webkit-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - } - - // Special fixes to round the left border on the first td/th - caption + thead tr:first-child th:first-child, - caption + tbody tr:first-child td:first-child, - colgroup + thead tr:first-child th:first-child, - colgroup + tbody tr:first-child td:first-child { - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - } - caption + thead tr:first-child th:last-child, - caption + tbody tr:first-child td:last-child, - colgroup + thead tr:first-child th:last-child, - colgroup + tbody tr:first-child td:last-child { - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - -moz-border-radius-topleft: 4px; - } - -} - - - - -// ZEBRA-STRIPING -// -------------- - -// Default zebra-stripe styles (alternating gray and transparent backgrounds) -.table-striped { - tbody { - tr:nth-child(odd) td, - tr:nth-child(odd) th { - background-color: @tableBackgroundAccent; - } - } -} - - -// HOVER EFFECT -// ------------ -// Placed here since it has to come after the potential zebra striping -.table-hover { - tbody { - tr:hover td, - tr:hover th { - background-color: @tableBackgroundHover; - } - } -} - - -// TABLE CELL SIZING -// ----------------- - -// Reset default grid behavior -table [class*=span], -.row-fluid table [class*=span] { - display: table-cell; - float: none; // undo default grid column styles - margin-left: 0; // undo default grid column styles -} - -// Change the column widths to account for td/th padding -.table { - .span1 { .tableColumns(1); } - .span2 { .tableColumns(2); } - .span3 { .tableColumns(3); } - .span4 { .tableColumns(4); } - .span5 { .tableColumns(5); } - .span6 { .tableColumns(6); } - .span7 { .tableColumns(7); } - .span8 { .tableColumns(8); } - .span9 { .tableColumns(9); } - .span10 { .tableColumns(10); } - .span11 { .tableColumns(11); } - .span12 { .tableColumns(12); } - .span13 { .tableColumns(13); } - .span14 { .tableColumns(14); } - .span15 { .tableColumns(15); } - .span16 { .tableColumns(16); } - .span17 { .tableColumns(17); } - .span18 { .tableColumns(18); } - .span19 { .tableColumns(19); } - .span20 { .tableColumns(20); } - .span21 { .tableColumns(21); } - .span22 { .tableColumns(22); } - .span23 { .tableColumns(23); } - .span24 { .tableColumns(24); } -} - - - -// TABLE BACKGROUNDS -// ----------------- -// Exact selectors below required to override .table-striped - -.table tbody tr { - &.success td { - background-color: @successBackground; - } - &.error td { - background-color: @errorBackground; - } - &.warning td { - background-color: @warningBackground; - } - &.info td { - background-color: @infoBackground; - } -} - -// Hover states for .table-hover -.table-hover tbody tr { - &.success:hover td { - background-color: darken(@successBackground, 5%); - } - &.error:hover td { - background-color: darken(@errorBackground, 5%); - } - &.warning:hover td { - background-color: darken(@warningBackground, 5%); - } - &.info:hover td { - background-color: darken(@infoBackground, 5%); - } -} - -// Components: common -// -// Sprites -// -------------------------------------------------- - - -// ICONS -// ----- - -// All icons receive the styles of the tag with a base class -// of .i and are then given a unique class to add width, height, -// and background-position. Your resulting HTML will look like -// . - -// For the white version of the icons, just add the .icon-white class: -// - -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - .ie7-restore-right-whitespace(); - line-height: 14px; - vertical-align: text-top; - background-image: url("@{iconSpritePath}"); - background-position: 14px 14px; - background-repeat: no-repeat; - margin-top: 1px; -} - -/* White icons with optional class, or on hover/active states of certain elements */ -.icon-white, -.nav-tabs > .active > a > [class^="icon-"], -.nav-tabs > .active > a > [class*=" icon-"], -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"] { - background-image: url("@{iconWhiteSpritePath}"); -} - -.icon-glass { background-position: 0 0; } -.icon-music { background-position: -24px 0; } -.icon-search { background-position: -48px 0; } -.icon-envelope { background-position: -72px 0; } -.icon-heart { background-position: -96px 0; } -.icon-star { background-position: -120px 0; } -.icon-star-empty { background-position: -144px 0; } -.icon-user { background-position: -168px 0; } -.icon-film { background-position: -192px 0; } -.icon-th-large { background-position: -216px 0; } -.icon-th { background-position: -240px 0; } -.icon-th-list { background-position: -264px 0; } -.icon-ok { background-position: -288px 0; } -.icon-remove { background-position: -312px 0; } -.icon-zoom-in { background-position: -336px 0; } -.icon-zoom-out { background-position: -360px 0; } -.icon-off { background-position: -384px 0; } -.icon-signal { background-position: -408px 0; } -.icon-cog { background-position: -432px 0; } -.icon-trash { background-position: -456px 0; } - -.icon-home { background-position: 0 -24px; } -.icon-file { background-position: -24px -24px; } -.icon-time { background-position: -48px -24px; } -.icon-road { background-position: -72px -24px; } -.icon-download-alt { background-position: -96px -24px; } -.icon-download { background-position: -120px -24px; } -.icon-upload { background-position: -144px -24px; } -.icon-inbox { background-position: -168px -24px; } -.icon-play-circle { background-position: -192px -24px; } -.icon-repeat { background-position: -216px -24px; } -.icon-refresh { background-position: -240px -24px; } -.icon-list-alt { background-position: -264px -24px; } -.icon-lock { background-position: -287px -24px; } // 1px off -.icon-flag { background-position: -312px -24px; } -.icon-headphones { background-position: -336px -24px; } -.icon-volume-off { background-position: -360px -24px; } -.icon-volume-down { background-position: -384px -24px; } -.icon-volume-up { background-position: -408px -24px; } -.icon-qrcode { background-position: -432px -24px; } -.icon-barcode { background-position: -456px -24px; } - -.icon-tag { background-position: 0 -48px; } -.icon-tags { background-position: -25px -48px; } // 1px off -.icon-book { background-position: -48px -48px; } -.icon-bookmark { background-position: -72px -48px; } -.icon-print { background-position: -96px -48px; } -.icon-camera { background-position: -120px -48px; } -.icon-font { background-position: -144px -48px; } -.icon-bold { background-position: -167px -48px; } // 1px off -.icon-italic { background-position: -192px -48px; } -.icon-text-height { background-position: -216px -48px; } -.icon-text-width { background-position: -240px -48px; } -.icon-align-left { background-position: -264px -48px; } -.icon-align-center { background-position: -288px -48px; } -.icon-align-right { background-position: -312px -48px; } -.icon-align-justify { background-position: -336px -48px; } -.icon-list { background-position: -360px -48px; } -.icon-indent-left { background-position: -384px -48px; } -.icon-indent-right { background-position: -408px -48px; } -.icon-facetime-video { background-position: -432px -48px; } -.icon-picture { background-position: -456px -48px; } - -.icon-pencil { background-position: 0 -72px; } -.icon-map-marker { background-position: -24px -72px; } -.icon-adjust { background-position: -48px -72px; } -.icon-tint { background-position: -72px -72px; } -.icon-edit { background-position: -96px -72px; } -.icon-share { background-position: -120px -72px; } -.icon-check { background-position: -144px -72px; } -.icon-move { background-position: -168px -72px; } -.icon-step-backward { background-position: -192px -72px; } -.icon-fast-backward { background-position: -216px -72px; } -.icon-backward { background-position: -240px -72px; } -.icon-play { background-position: -264px -72px; } -.icon-pause { background-position: -288px -72px; } -.icon-stop { background-position: -312px -72px; } -.icon-forward { background-position: -336px -72px; } -.icon-fast-forward { background-position: -360px -72px; } -.icon-step-forward { background-position: -384px -72px; } -.icon-eject { background-position: -408px -72px; } -.icon-chevron-left { background-position: -432px -72px; } -.icon-chevron-right { background-position: -456px -72px; } - -.icon-plus-sign { background-position: 0 -96px; } -.icon-minus-sign { background-position: -24px -96px; } -.icon-remove-sign { background-position: -48px -96px; } -.icon-ok-sign { background-position: -72px -96px; } -.icon-question-sign { background-position: -96px -96px; } -.icon-info-sign { background-position: -120px -96px; } -.icon-screenshot { background-position: -144px -96px; } -.icon-remove-circle { background-position: -168px -96px; } -.icon-ok-circle { background-position: -192px -96px; } -.icon-ban-circle { background-position: -216px -96px; } -.icon-arrow-left { background-position: -240px -96px; } -.icon-arrow-right { background-position: -264px -96px; } -.icon-arrow-up { background-position: -289px -96px; } // 1px off -.icon-arrow-down { background-position: -312px -96px; } -.icon-share-alt { background-position: -336px -96px; } -.icon-resize-full { background-position: -360px -96px; } -.icon-resize-small { background-position: -384px -96px; } -.icon-plus { background-position: -408px -96px; } -.icon-minus { background-position: -433px -96px; } -.icon-asterisk { background-position: -456px -96px; } - -.icon-exclamation-sign { background-position: 0 -120px; } -.icon-gift { background-position: -24px -120px; } -.icon-leaf { background-position: -48px -120px; } -.icon-fire { background-position: -72px -120px; } -.icon-eye-open { background-position: -96px -120px; } -.icon-eye-close { background-position: -120px -120px; } -.icon-warning-sign { background-position: -144px -120px; } -.icon-plane { background-position: -168px -120px; } -.icon-calendar { background-position: -192px -120px; } -.icon-random { background-position: -216px -120px; width: 16px; } -.icon-comment { background-position: -240px -120px; } -.icon-magnet { background-position: -264px -120px; } -.icon-chevron-up { background-position: -288px -120px; } -.icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off -.icon-retweet { background-position: -336px -120px; } -.icon-shopping-cart { background-position: -360px -120px; } -.icon-folder-close { background-position: -384px -120px; } -.icon-folder-open { background-position: -408px -120px; width: 16px; } -.icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off -.icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off - -.icon-hdd { background-position: 0 -144px; } -.icon-bullhorn { background-position: -24px -144px; } -.icon-bell { background-position: -48px -144px; } -.icon-certificate { background-position: -72px -144px; } -.icon-thumbs-up { background-position: -96px -144px; } -.icon-thumbs-down { background-position: -120px -144px; } -.icon-hand-right { background-position: -144px -144px; } -.icon-hand-left { background-position: -168px -144px; } -.icon-hand-up { background-position: -192px -144px; } -.icon-hand-down { background-position: -216px -144px; } -.icon-circle-arrow-right { background-position: -240px -144px; } -.icon-circle-arrow-left { background-position: -264px -144px; } -.icon-circle-arrow-up { background-position: -288px -144px; } -.icon-circle-arrow-down { background-position: -312px -144px; } -.icon-globe { background-position: -336px -144px; } -.icon-wrench { background-position: -360px -144px; } -.icon-tasks { background-position: -384px -144px; } -.icon-filter { background-position: -408px -144px; } -.icon-briefcase { background-position: -432px -144px; } -.icon-fullscreen { background-position: -456px -144px; } -// -// Dropdown menus -// -------------------------------------------------- - - -// Use the .menu class on any
    • element within the topbar or ul.tabs and you'll get some superfancy dropdowns -.dropup, -.dropdown { - position: relative; -} -.dropdown-toggle { - // The caret makes the toggle a bit too tall in IE7 - *margin-bottom: -3px; -} -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - -// Dropdown arrow/caret -// -------------------- -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-top: 4px solid @black; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - content: ""; -} - -// Place the caret -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - -// The dropdown menu (ul) -// ---------------------- -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: @zindexDropdown; - display: none; // none by default, but block on "open" of the menu - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; // override default ul - list-style: none; - background-color: @dropdownBackground; - border: 1px solid #ccc; // Fallback for IE7-8 - border: 1px solid @dropdownBorder; - *border-right-width: 2px; - *border-bottom-width: 2px; - .border-radius(6px); - .box-shadow(0 5px 10px rgba(0,0,0,.2)); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - - // Aligns the dropdown menu to right - &.pull-right { - right: 0; - left: auto; - } - - // Dividers (basically an hr) within the dropdown - .divider { - .nav-divider(@dropdownDividerTop, @dropdownDividerBottom); - } - - // Links within the dropdown menu - a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: @baseLineHeight; - color: @dropdownLinkColor; - white-space: nowrap; - } -} - -// Hover state -// ----------- -.dropdown-menu li > a:hover, -.dropdown-menu li > a:focus, -.dropdown-submenu:hover > a { - text-decoration: none; - color: @dropdownLinkColorHover; - background-color: @dropdownLinkBackgroundHover; - #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%)); -} - -// Active state -// ------------ -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: @dropdownLinkColorHover; - text-decoration: none; - outline: 0; - background-color: @dropdownLinkBackgroundActive; - #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%)); -} - -// Disabled state -// -------------- -// Gray out text and ensure the hover state remains gray -.dropdown-menu .disabled > a, -.dropdown-menu .disabled > a:hover { - color: @grayLight; -} -// Nuke hover effects -.dropdown-menu .disabled > a:hover { - text-decoration: none; - background-color: transparent; - cursor: default; -} - -// Open state for the dropdown -// --------------------------- -.open { - // IE7's z-index only goes to the nearest positioned ancestor, which would - // make the menu appear below buttons that appeared later on the page - *z-index: @zindexDropdown; - - & > .dropdown-menu { - display: block; - } -} - -// Right aligned dropdowns -// --------------------------- -.pull-right > .dropdown-menu { - right: 0; - left: auto; -} - -// Allow for dropdowns to go bottom up (aka, dropup-menu) -// ------------------------------------------------------ -// Just add .dropup after the standard .dropdown class and you're set, bro. -// TODO: abstract this so that the navbar fixed styles are not placed here? -.dropup, -.navbar-fixed-bottom .dropdown { - // Reverse the caret - .caret { - border-top: 0; - border-bottom: 4px solid @black; - content: ""; - } - // Different positioning for bottom up menu - .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; - } -} - -// Sub menus -// --------------------------- -.dropdown-submenu { - position: relative; -} -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - -webkit-border-radius: 0 6px 6px 6px; - -moz-border-radius: 0 6px 6px 6px; - border-radius: 0 6px 6px 6px; -} -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -.dropdown-submenu > a:after { - display: block; - content: " "; - float: right; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; - border-width: 5px 0 5px 5px; - border-left-color: darken(@dropdownBackground, 20%); - margin-top: 5px; - margin-right: -10px; -} -.dropdown-submenu:hover > a:after { - border-left-color: @dropdownLinkColorHover; -} - - -// Tweak nav headers -// ----------------- -// Increase padding from 15px to 20px on sides -.dropdown .dropdown-menu .nav-header { - padding-left: 20px; - padding-right: 20px; -} - -// Typeahead -// --------- -.typeahead { - margin-top: 2px; // give it some space to breathe - .border-radius(4px); -} -// -// Wells -// -------------------------------------------------- - - -// Base class -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: @wellBackground; - border: 1px solid darken(@wellBackground, 7%); - .border-radius(4px); - .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); - blockquote { - border-color: #ddd; - border-color: rgba(0,0,0,.15); - } -} - -// Sizes -.well-large { - padding: 24px; - .border-radius(6px); -} -.well-small { - padding: 9px; - .border-radius(3px); -} -// -// Component animations -// -------------------------------------------------- - - -.fade { - opacity: 0; - .transition(opacity .15s linear); - &.in { - opacity: 1; - } -} - -.collapse { - position: relative; - height: 0; - overflow: hidden; - .transition(height .35s ease); - &.in { - height: auto; - } -} -// -// Close icons -// -------------------------------------------------- - - -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: @baseLineHeight; - color: @black; - text-shadow: 0 1px 0 rgba(255,255,255,1); - .opacity(20); - &:hover { - color: @black; - text-decoration: none; - cursor: pointer; - .opacity(40); - } -} - -// Additional properties for button version -// iOS requires the button element instead of an anchor tag. -// If you want the anchor version, it requires `href="#"`. -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} -// Components: Buttons & Alerts -// -// Buttons -// -------------------------------------------------- - - -// Base styles -// -------------------------------------------------- - -// Core -.btn { - display: inline-block; - .ie7-inline-block(); - padding: 4px 14px; - margin-bottom: 0; // For input.btn - font-size: @baseFontSize; - line-height: @baseLineHeight; - *line-height: @baseLineHeight; - text-align: center; - vertical-align: middle; - cursor: pointer; - .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); - border: 1px solid @btnBorder; - *border: 0; // Remove the border to prevent IE7's black border on input:focus - border-bottom-color: darken(@btnBorder, 10%); - .border-radius(4px); - .ie7-restore-left-whitespace(); // Give IE7 some love - .box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); - - // Hover state - &:hover { - color: @grayDark; - text-decoration: none; - background-color: darken(@white, 10%); - *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */ - background-position: 0 -15px; - - // transition is only when going to hover, otherwise the background - // behind the gradient (there for IE<=9 fallback) gets mismatched - .transition(background-position .1s linear); - } - - // Focus state for keyboard and accessibility - &:focus { - .tab-focus(); - } - - // Active state - &.active, - &:active { - background-color: darken(@white, 10%); - background-color: darken(@white, 15%) e("\9"); - background-image: none; - outline: 0; - .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); - } - - // Disabled state - &.disabled, - &[disabled] { - cursor: default; - background-color: darken(@white, 10%); - background-image: none; - .opacity(65); - .box-shadow(none); - } - -} - - - -// Button Sizes -// -------------------------------------------------- - -// Large -.btn-large { - padding: 9px 14px; - font-size: @baseFontSize + 2px; - line-height: normal; - .border-radius(5px); -} -.btn-large [class^="icon-"] { - margin-top: 2px; -} - -// Small -.btn-small { - padding: 3px 9px; - font-size: @baseFontSize - 2px; - line-height: @baseLineHeight - 2px; -} -.btn-small [class^="icon-"] { - margin-top: 0; -} - -// Mini -.btn-mini { - padding: 2px 6px; - font-size: @baseFontSize - 3px; - line-height: @baseLineHeight - 3px; -} - - -// Block button -// ------------------------- - -.btn-block { - display: block; - width: 100%; - padding-left: 0; - padding-right: 0; - .box-sizing(border-box); -} - -// Vertically space out multiple block buttons -.btn-block + .btn-block { - margin-top: 5px; -} - -// Specificity overrides -input[type="submit"], -input[type="reset"], -input[type="button"] { - &.btn-block { - width: 100%; - } -} - - - -// Alternate buttons -// -------------------------------------------------- - -// Provide *some* extra contrast for those who can get it -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255,255,255,.75); -} - -// Set the backgrounds -// ------------------------- -.btn { - // reset here as of 2.0.3 due to Recess property order - border-color: #c5c5c5; - border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); -} -.btn-primary { - .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); -} -// Warning appears are orange -.btn-warning { - .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight); -} -// Danger and error appear as red -.btn-danger { - .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight); -} -// Success appears as green -.btn-success { - .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight); -} -// Info appears as a neutral blue -.btn-info { - .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight); -} -// Inverse appears as dark gray -.btn-inverse { - .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight); -} - - -// Cross-browser Jank -// -------------------------------------------------- - -button.btn, -input[type="submit"].btn { - - // Firefox 3.6 only I believe - &::-moz-focus-inner { - padding: 0; - border: 0; - } - - // IE7 has some default padding on button controls - *padding-top: 3px; - *padding-bottom: 3px; - - &.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; - } - &.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; - } - &.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; - } -} - - -// Link buttons -// -------------------------------------------------- - -// Make a button look and behave like a link -.btn-link, -.btn-link:active, -.btn-link[disabled] { - background-color: transparent; - background-image: none; - .box-shadow(none); -} -.btn-link { - border-color: transparent; - cursor: pointer; - color: @linkColor; - .border-radius(0); -} -.btn-link:hover { - color: @linkColorHover; - text-decoration: underline; - background-color: transparent; -} -.btn-link[disabled]:hover { - color: @grayDark; - text-decoration: none; -} -// -// Button groups -// -------------------------------------------------- - - -// Make the div behave like a button -.btn-group { - position: relative; - font-size: 0; // remove as part 1 of font-size inline-block hack - vertical-align: middle; // match .btn alignment given font-size hack above - white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page) - .ie7-restore-left-whitespace(); -} - -// Space out series of button groups -.btn-group + .btn-group { - margin-left: 5px; -} - -// Optional: Group multiple button groups together for a toolbar -.btn-toolbar { - font-size: 0; // Hack to remove whitespace that results from using inline-block - margin-top: @baseLineHeight / 2; - margin-bottom: @baseLineHeight / 2; - .btn-group { - display: inline-block; - .ie7-inline-block(); - } - .btn + .btn, - .btn-group + .btn, - .btn + .btn-group { - margin-left: 5px; - } -} - -// Float them, remove border radius, then re-add to first and last elements -.btn-group > .btn { - position: relative; - .border-radius(0); -} -.btn-group > .btn + .btn { - margin-left: -1px; -} -.btn-group > .btn, -.btn-group > .dropdown-menu { - font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack -} - -// Reset fonts for other sizes -.btn-group > .btn-mini { - font-size: 11px; -} -.btn-group > .btn-small { - font-size: 12px; -} -.btn-group > .btn-large { - font-size: 16px; -} - -// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match -.btn-group > .btn:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; -} -// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it -.btn-group > .btn:last-child, -.btn-group > .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; -} -// Reset corners for large buttons -.btn-group > .btn.large:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; -} -.btn-group > .btn.large:last-child, -.btn-group > .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; -} - -// On hover/focus/active, bring the proper btn to front -.btn-group > .btn:hover, -.btn-group > .btn:focus, -.btn-group > .btn:active, -.btn-group > .btn.active { - z-index: 2; -} - -// On active and open, don't show outline -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - - - -// Split button dropdowns -// ---------------------- - -// Give the line between buttons some depth -.btn-group > .btn + .dropdown-toggle { - padding-left: 8px; - padding-right: 8px; - .box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); - *padding-top: 5px; - *padding-bottom: 5px; -} -.btn-group > .btn-mini + .dropdown-toggle { - padding-left: 5px; - padding-right: 5px; - *padding-top: 2px; - *padding-bottom: 2px; -} -.btn-group > .btn-small + .dropdown-toggle { - *padding-top: 5px; - *padding-bottom: 4px; -} -.btn-group > .btn-large + .dropdown-toggle { - padding-left: 12px; - padding-right: 12px; - *padding-top: 7px; - *padding-bottom: 7px; -} - -.btn-group.open { - - // The clickable button for toggling the menu - // Remove the gradient and set the same inset shadow as the :active state - .dropdown-toggle { - background-image: none; - .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); - } - - // Keep the hover's background when dropdown is open - .btn.dropdown-toggle { - background-color: @btnBackgroundHighlight; - } - .btn-primary.dropdown-toggle { - background-color: @btnPrimaryBackgroundHighlight; - } - .btn-warning.dropdown-toggle { - background-color: @btnWarningBackgroundHighlight; - } - .btn-danger.dropdown-toggle { - background-color: @btnDangerBackgroundHighlight; - } - .btn-success.dropdown-toggle { - background-color: @btnSuccessBackgroundHighlight; - } - .btn-info.dropdown-toggle { - background-color: @btnInfoBackgroundHighlight; - } - .btn-inverse.dropdown-toggle { - background-color: @btnInverseBackgroundHighlight; - } -} - - -// Reposition the caret -.btn .caret { - margin-top: 8px; - margin-left: 0; -} -// Carets in other button sizes -.btn-mini .caret, -.btn-small .caret, -.btn-large .caret { - margin-top: 6px; -} -.btn-large .caret { - border-left-width: 5px; - border-right-width: 5px; - border-top-width: 5px; -} -// Upside down carets for .dropup -.dropup .btn-large .caret { - border-bottom: 5px solid @black; - border-top: 0; -} - - - -// Account for other colors -.btn-primary, -.btn-warning, -.btn-danger, -.btn-info, -.btn-success, -.btn-inverse { - .caret { - border-top-color: @white; - border-bottom-color: @white; - } -} - - - -// Vertical button groups -// ---------------------- - -.btn-group-vertical { - display: inline-block; // makes buttons only take up the width they need - .ie7-inline-block(); -} -.btn-group-vertical .btn { - display: block; - float: none; - width: 100%; - .border-radius(0); -} -.btn-group-vertical .btn + .btn { - margin-left: 0; - margin-top: -1px; -} -.btn-group-vertical .btn:first-child { - .border-radius(4px 4px 0 0); -} -.btn-group-vertical .btn:last-child { - .border-radius(0 0 4px 4px); -} -.btn-group-vertical .btn-large:first-child { - .border-radius(6px 6px 0 0); -} -.btn-group-vertical .btn-large:last-child { - .border-radius(0 0 6px 6px); -} -// -// Alerts -// -------------------------------------------------- - - -// Base styles -// ------------------------- - -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: @baseLineHeight; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - background-color: @warningBackground; - border: 1px solid @warningBorder; - .border-radius(4px); - color: @warningText; -} -.alert h4 { - margin: 0; -} - -// Adjust close link position -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: @baseLineHeight; -} - - -// Alternate styles -// ------------------------- - -.alert-success { - background-color: @successBackground; - border-color: @successBorder; - color: @successText; -} -.alert-danger, -.alert-error { - background-color: @errorBackground; - border-color: @errorBorder; - color: @errorText; -} -.alert-info { - background-color: @infoBackground; - border-color: @infoBorder; - color: @infoText; -} - - -// Block alerts -// ------------------------- - -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} - -// Components: Nav -// -// Navs -// -------------------------------------------------- - - -// BASE CLASS -// ---------- - -.nav { - margin-left: 0; - margin-bottom: @baseLineHeight; - list-style: none; -} - -// Make links block level -.nav > li > a { - display: block; -} -.nav > li > a:hover { - text-decoration: none; - background-color: @grayLighter; -} - -// Redeclare pull classes because of specifity -.nav > .pull-right { - float: right; -} - -// Nav headers (for dropdowns and lists) -.nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: @baseLineHeight; - color: @grayLight; - text-shadow: 0 1px 0 rgba(255,255,255,.5); - text-transform: uppercase; -} -// Space them out when they follow another list item (link) -.nav li + .nav-header { - margin-top: 9px; -} - - - -// NAV LIST -// -------- - -.nav-list { - padding-left: 15px; - padding-right: 15px; - margin-bottom: 0; -} -.nav-list > li > a, -.nav-list .nav-header { - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255,255,255,.5); -} -.nav-list > li > a { - padding: 3px 15px; -} -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: @white; - text-shadow: 0 -1px 0 rgba(0,0,0,.2); - background-color: @linkColor; -} -.nav-list [class^="icon-"] { - margin-right: 2px; -} -// Dividers (basically an hr) within the dropdown -.nav-list .divider { - .nav-divider(); -} - - - -// TABS AND PILLS -// ------------- - -// Common styles -.nav-tabs, -.nav-pills { - .clearfix(); -} -.nav-tabs > li, -.nav-pills > li { - float: left; -} -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; // keeps the overall height an even number -} - -// TABS -// ---- - -// Give the tabs something to sit on -.nav-tabs { - border-bottom: 1px solid #ddd; -} -// Make the list-items overlay the bottom border -.nav-tabs > li { - margin-bottom: -1px; -} -// Actual tabs (as links) -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: @baseLineHeight; - border: 1px solid transparent; - .border-radius(4px 4px 0 0); - &:hover { - border-color: @grayLighter @grayLighter #ddd; - } -} -// Active state, and it's :hover to override normal :hover -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: @gray; - background-color: @white; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; -} - - -// PILLS -// ----- - -// Links rendered as pills -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - .border-radius(5px); -} - -// Active state -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: @white; - background-color: @linkColor; -} - - - -// STACKED NAV -// ----------- - -// Stacked tabs and pills -.nav-stacked > li { - float: none; -} -.nav-stacked > li > a { - margin-right: 0; // no need for the gap between nav items -} - -// Tabs -.nav-tabs.nav-stacked { - border-bottom: 0; -} -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - .border-radius(0); -} -.nav-tabs.nav-stacked > li:first-child > a { - .border-top-radius(4px); -} -.nav-tabs.nav-stacked > li:last-child > a { - .border-bottom-radius(4px); -} -.nav-tabs.nav-stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} - -// Pills -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; // decrease margin to match sizing of stacked tabs -} - - - -// DROPDOWNS -// --------- - -.nav-tabs .dropdown-menu { - .border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu -} -.nav-pills .dropdown-menu { - .border-radius(6px); // make rounded corners match the pills -} - -// Default dropdown links -// ------------------------- -// Make carets use linkColor to start -.nav .dropdown-toggle .caret { - border-top-color: @linkColor; - border-bottom-color: @linkColor; - margin-top: 6px; -} -.nav .dropdown-toggle:hover .caret { - border-top-color: @linkColorHover; - border-bottom-color: @linkColorHover; -} -/* move down carets for tabs */ -.nav-tabs .dropdown-toggle .caret { - margin-top: 8px; -} - -// Active dropdown links -// ------------------------- -.nav .active .dropdown-toggle .caret { - border-top-color: #fff; - border-bottom-color: #fff; -} -.nav-tabs .active .dropdown-toggle .caret { - border-top-color: @gray; - border-bottom-color: @gray; -} - -// Active:hover dropdown links -// ------------------------- -.nav > .dropdown.active > a:hover { - cursor: pointer; -} - -// Open dropdowns -// ------------------------- -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > li.dropdown.open.active > a:hover { - color: @white; - background-color: @grayLight; - border-color: @grayLight; -} -.nav li.dropdown.open .caret, -.nav li.dropdown.open.active .caret, -.nav li.dropdown.open a:hover .caret { - border-top-color: @white; - border-bottom-color: @white; - .opacity(100); -} - -// Dropdowns in stacked tabs -.tabs-stacked .open > a:hover { - border-color: @grayLight; -} - - - -// TABBABLE -// -------- - - -// COMMON STYLES -// ------------- - -// Clear any floats -.tabbable { - .clearfix(); -} -.tab-content { - overflow: auto; // prevent content from running below tabs -} - -// Remove border on bottom, left, right -.tabs-below > .nav-tabs, -.tabs-right > .nav-tabs, -.tabs-left > .nav-tabs { - border-bottom: 0; -} - -// Show/hide tabbable areas -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} -.tab-content > .active, -.pill-content > .active { - display: block; -} - - -// BOTTOM -// ------ - -.tabs-below > .nav-tabs { - border-top: 1px solid #ddd; -} -.tabs-below > .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below > .nav-tabs > li > a { - .border-radius(0 0 4px 4px); - &:hover { - border-bottom-color: transparent; - border-top-color: #ddd; - } -} -.tabs-below > .nav-tabs > .active > a, -.tabs-below > .nav-tabs > .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} - -// LEFT & RIGHT -// ------------ - -// Common styles -.tabs-left > .nav-tabs > li, -.tabs-right > .nav-tabs > li { - float: none; -} -.tabs-left > .nav-tabs > li > a, -.tabs-right > .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} - -// Tabs on the left -.tabs-left > .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left > .nav-tabs > li > a { - margin-right: -1px; - .border-radius(4px 0 0 4px); -} -.tabs-left > .nav-tabs > li > a:hover { - border-color: @grayLighter #ddd @grayLighter @grayLighter; -} -.tabs-left > .nav-tabs .active > a, -.tabs-left > .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: @white; -} - -// Tabs on the right -.tabs-right > .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right > .nav-tabs > li > a { - margin-left: -1px; - .border-radius(0 4px 4px 0); -} -.tabs-right > .nav-tabs > li > a:hover { - border-color: @grayLighter @grayLighter @grayLighter #ddd; -} -.tabs-right > .nav-tabs .active > a, -.tabs-right > .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: @white; -} - - - -// DISABLED STATES -// --------------- - -// Gray out text -.nav > .disabled > a { - color: @grayLight; -} -// Nuke hover effects -.nav > .disabled > a:hover { - text-decoration: none; - background-color: transparent; - cursor: default; -} -// -// Navbars (Redux) -// -------------------------------------------------- - - -// COMMON STYLES -// ------------- - -// Base class and wrapper -.navbar { - overflow: visible; - margin-bottom: @baseLineHeight; - color: @navbarText; - - // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar - *position: relative; - *z-index: 2; -} - -// Inner for background effects -// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present -.navbar-inner { - min-height: @navbarHeight; - padding-left: 20px; - padding-right: 20px; - #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); - border: 1px solid @navbarBorder; - .border-radius(4px); - .box-shadow(0 1px 4px rgba(0,0,0,.065)); - - // Prevent floats from breaking the navbar - .clearfix(); -} - -// Set width to auto for default container -// We then reset it for fixed navbars in the #gridSystem mixin -.navbar .container { - width: auto; -} - -// Override the default collapsed state -.nav-collapse.collapse { - height: auto; -} - - -// Brand: website or project name -// ------------------------- -.navbar .brand { - float: left; - display: block; - // Vertically center the text given @navbarHeight - padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2); - margin-left: -20px; // negative indent to left-align the text down the page - font-size: 20px; - font-weight: 200; - color: @navbarBrandColor; - text-shadow: 0 1px 0 @navbarBackgroundHighlight; - &:hover { - text-decoration: none; - } -} - -// Plain text in topbar -// ------------------------- -.navbar-text { - margin-bottom: 0; - line-height: @navbarHeight; -} - -// Janky solution for now to account for links outside the .nav -// ------------------------- -.navbar-link { - color: @navbarLinkColor; - &:hover { - color: @navbarLinkColorHover; - } -} - -// Dividers in navbar -// ------------------------- -.navbar .divider-vertical { - height: @navbarHeight; - margin: 0 9px; - border-left: 1px solid @navbarBackground; - border-right: 1px solid @navbarBackgroundHighlight; -} - -// Buttons in navbar -// ------------------------- -.navbar .btn, -.navbar .btn-group { - .navbarVerticalAlign(30px); // Vertically center in navbar -} -.navbar .btn-group .btn, -.navbar .input-prepend .btn, -.navbar .input-append .btn { - margin-top: 0; // then undo the margin here so we don't accidentally double it -} - -// Navbar forms -// ------------------------- -.navbar-form { - margin-bottom: 0; // remove default bottom margin - .clearfix(); - input, - select, - .radio, - .checkbox { - .navbarVerticalAlign(30px); // Vertically center in navbar - } - input, - select, - .btn { - display: inline-block; - margin-bottom: 0; - } - input[type="image"], - input[type="checkbox"], - input[type="radio"] { - margin-top: 3px; - } - .input-append, - .input-prepend { - margin-top: 6px; - white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left - input { - margin-top: 0; // remove the margin on top since it's on the parent - } - } -} - -// Navbar search -// ------------------------- -.navbar-search { - position: relative; - float: left; - .navbarVerticalAlign(30px); // Vertically center in navbar - margin-bottom: 0; - .search-query { - margin-bottom: 0; - padding: 4px 14px; - #font > .sans-serif(13px, normal, 1); - .border-radius(15px); // redeclare because of specificity of the type attribute - } -} - - - -// Static navbar -// ------------------------- - -.navbar-static-top { - position: static; - width: 100%; - margin-bottom: 0; // remove 18px margin for default navbar - .navbar-inner { - .border-radius(0); - } -} - - - -// Fixed navbar -// ------------------------- - -// Shared (top/bottom) styles -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: @zindexFixedNavbar; - margin-bottom: 0; // remove 18px margin for default navbar -} -.navbar-fixed-top .navbar-inner, -.navbar-static-top .navbar-inner { - border-width: 0 0 1px; -} -.navbar-fixed-bottom .navbar-inner { - border-width: 1px 0 0; -} -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-left: 0; - padding-right: 0; - .border-radius(0); -} - -// Reset container width -// Required here as we reset the width earlier on and the grid mixins don't override early enough -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - #grid > .core > .span(@gridColumns); -} - -// Fixed to top -.navbar-fixed-top { - top: 0; -} -.navbar-fixed-top, -.navbar-static-top { - .navbar-inner { - .box-shadow(inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)); - } -} - -// Fixed to bottom -.navbar-fixed-bottom { - bottom: 0; - .navbar-inner { - .box-shadow(inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)); - } -} - - - -// NAVIGATION -// ---------- - -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; // redeclare due to specificity - margin-right: 0; // remove margin on float right nav -} -.navbar .nav > li { - float: left; -} - -// Links -.navbar .nav > li > a { - float: none; - // Vertically center the text given @navbarHeight - padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2); - color: @navbarLinkColor; - text-decoration: none; - text-shadow: 0 1px 0 @navbarBackgroundHighlight; -} -.navbar .nav .dropdown-toggle .caret { - margin-top: 8px; -} - -// Hover -.navbar .nav > li > a:focus, -.navbar .nav > li > a:hover { - background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active - color: @navbarLinkColorHover; - text-decoration: none; -} - -// Active nav items -.navbar .nav > .active > a, -.navbar .nav > .active > a:hover, -.navbar .nav > .active > a:focus { - color: @navbarLinkColorActive; - text-decoration: none; - background-color: @navbarLinkBackgroundActive; - .box-shadow(inset 0 3px 8px rgba(0,0,0,.125)); -} - -// Navbar button for toggling navbar items in responsive layouts -// These definitions need to come after '.navbar .btn' -.navbar .btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%)); - .box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)); -} -.navbar .btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - .border-radius(1px); - .box-shadow(0 1px 0 rgba(0,0,0,.25)); -} -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} - - - -// Dropdown menus -// -------------- - -// Menu position and menu carets -.navbar .nav > li > .dropdown-menu { - &:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: @dropdownBorder; - position: absolute; - top: -7px; - left: 9px; - } - &:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid @dropdownBackground; - position: absolute; - top: -6px; - left: 10px; - } -} -// Menu position and menu caret support for dropups via extra dropup class -.navbar-fixed-bottom .nav > li > .dropdown-menu { - &:before { - border-top: 7px solid #ccc; - border-top-color: @dropdownBorder; - border-bottom: 0; - bottom: -7px; - top: auto; - } - &:after { - border-top: 6px solid @dropdownBackground; - border-bottom: 0; - bottom: -6px; - top: auto; - } -} - -// Remove background color from open dropdown -.navbar .nav li.dropdown.open > .dropdown-toggle, -.navbar .nav li.dropdown.active > .dropdown-toggle, -.navbar .nav li.dropdown.open.active > .dropdown-toggle { - background-color: @navbarLinkBackgroundActive; - color: @navbarLinkColorActive; -} -.navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: @navbarLinkColor; - border-bottom-color: @navbarLinkColor; -} -.navbar .nav li.dropdown.open > .dropdown-toggle .caret, -.navbar .nav li.dropdown.active > .dropdown-toggle .caret, -.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: @navbarLinkColorActive; - border-bottom-color: @navbarLinkColorActive; -} - -// Right aligned menus need alt position -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { - left: auto; - right: 0; - &:before { - left: auto; - right: 12px; - } - &:after { - left: auto; - right: 13px; - } - .dropdown-menu { - left: auto; - right: 100%; - margin-left: 0; - margin-right: -1px; - .border-radius(6px 0 6px 6px); - } -} - - -// Inverted navbar -// ------------------------- - -.navbar-inverse { - color: @navbarInverseText; - - .navbar-inner { - #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground); - border-color: @navbarInverseBorder; - } - - .brand, - .nav > li > a { - color: @navbarInverseLinkColor; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - &:hover { - color: @navbarInverseLinkColorHover; - } - } - - .nav > li > a:focus, - .nav > li > a:hover { - background-color: @navbarInverseLinkBackgroundHover; - color: @navbarInverseLinkColorHover; - } - - .nav .active > a, - .nav .active > a:hover, - .nav .active > a:focus { - color: @navbarInverseLinkColorActive; - background-color: @navbarInverseLinkBackgroundActive; - } - - // Inline text links - .navbar-link { - color: @navbarInverseLinkColor; - &:hover { - color: @navbarInverseLinkColorHover; - } - } - - // Dividers in navbar - .divider-vertical { - border-left-color: @navbarInverseBackground; - border-right-color: @navbarInverseBackgroundHighlight; - } - - // Dropdowns - .nav li.dropdown.open > .dropdown-toggle, - .nav li.dropdown.active > .dropdown-toggle, - .nav li.dropdown.open.active > .dropdown-toggle { - background-color: @navbarInverseLinkBackgroundActive; - color: @navbarInverseLinkColorActive; - } - .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: @navbarInverseLinkColor; - border-bottom-color: @navbarInverseLinkColor; - } - .nav li.dropdown.open > .dropdown-toggle .caret, - .nav li.dropdown.active > .dropdown-toggle .caret, - .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: @navbarInverseLinkColorActive; - border-bottom-color: @navbarInverseLinkColorActive; - } - - // Navbar search - .navbar-search { - .search-query { - color: @white; - background-color: @navbarInverseSearchBackground; - border-color: @navbarInverseSearchBorder; - .box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)); - .transition(none); - .placeholder(@navbarInverseSearchPlaceholderColor); - - // Focus states (we use .focused since IE7-8 and down doesn't support :focus) - &:focus, - &.focused { - padding: 5px 15px; - color: @grayDark; - text-shadow: 0 1px 0 @white; - background-color: @navbarInverseSearchBackgroundFocus; - border: 0; - .box-shadow(0 0 3px rgba(0,0,0,.15)); - outline: 0; - } - } - } - - // Navbar collapse button - .btn-navbar { - .buttonBackground(darken(@navbarInverseBackgroundHighlight, 5%), darken(@navbarInverseBackground, 5%)); - } - -} - - - -// -// Breadcrumbs -// -------------------------------------------------- - - -.breadcrumb { - padding: 8px 15px; - margin: 0 0 @baseLineHeight; - list-style: none; - background-color: #f5f5f5; - .border-radius(4px); - li { - display: inline-block; - .ie7-inline-block(); - text-shadow: 0 1px 0 @white; - } - .divider { - padding: 0 5px; - color: #ccc; - } - .active { - color: @grayLight; - } -} -// -// Pagination (multiple pages) -// -------------------------------------------------- - - -.pagination { - height: @baseLineHeight * 2; - margin: @baseLineHeight 0; - } -.pagination ul { - display: inline-block; - .ie7-inline-block(); - margin-left: 0; - margin-bottom: 0; - .border-radius(3px); - .box-shadow(0 1px 2px rgba(0,0,0,.05)); -} -.pagination ul > li { - display: inline; -} -.pagination ul > li > a, -.pagination ul > li > span { - float: left; - padding: 0 14px; - line-height: (@baseLineHeight * 2) - 2; - text-decoration: none; - background-color: @paginationBackground; - border: 1px solid @paginationBorder; - border-left-width: 0; -} -.pagination ul > li > a:hover, -.pagination ul > .active > a, -.pagination ul > .active > span { - background-color: #f5f5f5; -} -.pagination ul > .active > a, -.pagination ul > .active > span { - color: @grayLight; - cursor: default; -} -.pagination ul > .disabled > span, -.pagination ul > .disabled > a, -.pagination ul > .disabled > a:hover { - color: @grayLight; - background-color: transparent; - cursor: default; -} -.pagination ul > li:first-child > a, -.pagination ul > li:first-child > span { - border-left-width: 1px; - .border-radius(3px 0 0 3px); -} -.pagination ul > li:last-child > a, -.pagination ul > li:last-child > span { - .border-radius(0 3px 3px 0); -} - -// Centered -.pagination-centered { - text-align: center; -} -.pagination-right { - text-align: right; -} -// -// Pager pagination -// -------------------------------------------------- - - -.pager { - margin: @baseLineHeight 0; - list-style: none; - text-align: center; - .clearfix(); -} -.pager li { - display: inline; -} -.pager a, -.pager span { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - .border-radius(15px); -} -.pager a:hover { - text-decoration: none; - background-color: #f5f5f5; -} -.pager .next a, -.pager .next span { - float: right; -} -.pager .previous a { - float: left; -} -.pager .disabled a, -.pager .disabled a:hover, -.pager .disabled span { - color: @grayLight; - background-color: #fff; - cursor: default; -} -// Components: Popovers -// -// Modals -// -------------------------------------------------- - - -// Recalculate z-index where appropriate, -// but only apply to elements within modal -.modal-open .modal { - .dropdown-menu { z-index: @zindexDropdown + @zindexModal; } - .dropdown.open { *z-index: @zindexDropdown + @zindexModal; } - .popover { z-index: @zindexPopover + @zindexModal; } - .tooltip { z-index: @zindexTooltip + @zindexModal; } -} - -// Background -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: @zindexModalBackdrop; - background-color: @black; - // Fade for backdrop - &.fade { opacity: 0; } -} - -.modal-backdrop, -.modal-backdrop.fade.in { - .opacity(80); -} - -// Base modal -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: @zindexModal; - overflow: auto; - width: 560px; - margin: -250px 0 0 -280px; - background-color: @white; - border: 1px solid #999; - border: 1px solid rgba(0,0,0,.3); - *border: 1px solid #999; /* IE6-7 */ - .border-radius(6px); - .box-shadow(0 3px 7px rgba(0,0,0,0.3)); - .background-clip(padding-box); - &.fade { - .transition(e('opacity .3s linear, top .3s ease-out')); - top: -25%; - } - &.fade.in { top: 50%; } -} -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; - // Close icon - .close { margin-top: 2px; } - // Heading - h3 { - margin: 0; - line-height: 30px; - } -} - -// Body (where all modal content resides) -.modal-body { - overflow-y: auto; - max-height: 400px; - padding: 15px; -} -// Remove bottom margin if need be -.modal-form { - margin-bottom: 0; -} - -// Footer (for actions) -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; // right align buttons - background-color: #f5f5f5; - border-top: 1px solid #ddd; - .border-radius(0 0 6px 6px); - .box-shadow(inset 0 1px 0 @white); - .clearfix(); // clear it in case folks use .pull-* classes on buttons - - // Properly space out buttons - .btn + .btn { - margin-left: 5px; - margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs - } - // but override that for button groups - .btn-group .btn + .btn { - margin-left: -1px; - } -} -// -// Tooltips -// -------------------------------------------------- - - -// Base class -.tooltip { - position: absolute; - z-index: @zindexTooltip; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - .opacity(0); - &.in { .opacity(80); } - &.top { margin-top: -3px; } - &.right { margin-left: 3px; } - &.bottom { margin-top: 3px; } - &.left { margin-left: -3px; } -} - -// Wrapper for the tooltip content -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: @tooltipColor; - text-align: center; - text-decoration: none; - background-color: @tooltipBackground; - .border-radius(4px); -} - -// Arrows -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} -.tooltip { - &.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -@tooltipArrowWidth; - border-width: @tooltipArrowWidth @tooltipArrowWidth 0; - border-top-color: @tooltipArrowColor; - } - &.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -@tooltipArrowWidth; - border-width: @tooltipArrowWidth @tooltipArrowWidth @tooltipArrowWidth 0; - border-right-color: @tooltipArrowColor; - } - &.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -@tooltipArrowWidth; - border-width: @tooltipArrowWidth 0 @tooltipArrowWidth @tooltipArrowWidth; - border-left-color: @tooltipArrowColor; - } - &.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -@tooltipArrowWidth; - border-width: 0 @tooltipArrowWidth @tooltipArrowWidth; - border-bottom-color: @tooltipArrowColor; - } -} -// -// Popovers -// -------------------------------------------------- - - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: @zindexPopover; - display: none; - width: 236px; - padding: 1px; - background-color: @popoverBackground; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - border: 1px solid #ccc; - border: 1px solid rgba(0,0,0,.2); - .border-radius(6px); - .box-shadow(0 5px 10px rgba(0,0,0,.2)); - - // Offset the popover to account for the popover arrow - &.top { margin-bottom: 10px; } - &.right { margin-left: 10px; } - &.bottom { margin-top: 10px; } - &.left { margin-right: 10px; } - -} - -.popover-title { - margin: 0; // reset heading margin - padding: 8px 14px; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: @popoverTitleBackground; - border-bottom: 1px solid darken(@popoverTitleBackground, 5%); - .border-radius(5px 5px 0 0); -} - -.popover-content { - padding: 9px 14px; - p, ul, ol { - margin-bottom: 0; - } -} - -// Arrows -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: inline-block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} -.popover .arrow:after { - content: ""; - z-index: -1; -} - -.popover { - &.top .arrow { - bottom: -@popoverArrowWidth; - left: 50%; - margin-left: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth 0; - border-top-color: @popoverArrowColor; - &:after { - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - border-top-color: @popoverArrowOuterColor; - bottom: -1px; - left: -@popoverArrowOuterWidth; - } - } - &.right .arrow { - top: 50%; - left: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0; - border-right-color: @popoverArrowColor; - &:after { - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - border-right-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; - left: -1px; - } - } - &.bottom .arrow { - top: -@popoverArrowWidth; - left: 50%; - margin-left: -@popoverArrowWidth; - border-width: 0 @popoverArrowWidth @popoverArrowWidth; - border-bottom-color: @popoverArrowColor; - &:after { - border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-bottom-color: @popoverArrowOuterColor; - top: -1px; - left: -@popoverArrowOuterWidth; - } - } - &.left .arrow { - top: 50%; - right: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth; - border-left-color: @popoverArrowColor; - &:after { - border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-left-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; - right: -1px; - } - } -} - -// Components: Misc -// -// Thumbnails -// -------------------------------------------------- - - -// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files - -// Make wrapper ul behave like the grid -.thumbnails { - margin-left: -@gridGutterWidth; - list-style: none; - .clearfix(); -} -// Fluid rows have no left margin -.row-fluid .thumbnails { - margin-left: 0; -} - -// Float li to make thumbnails appear in a row -.thumbnails > li { - float: left; // Explicity set the float since we don't require .span* classes - margin-bottom: @baseLineHeight; - margin-left: @gridGutterWidth; -} - -// The actual thumbnail (can be `a` or `div`) -.thumbnail { - display: block; - padding: 4px; - line-height: @baseLineHeight; - border: 1px solid #ddd; - .border-radius(4px); - .box-shadow(0 1px 3px rgba(0,0,0,.055)); - .transition(all .2s ease-in-out); -} -// Add a hover state for linked versions only -a.thumbnail:hover { - border-color: @linkColor; - .box-shadow(0 1px 4px rgba(0,105,214,.25)); -} - -// Images and captions -.thumbnail > img { - display: block; - max-width: 100%; - margin-left: auto; - margin-right: auto; -} -.thumbnail .caption { - padding: 9px; - color: @gray; -} -// -// Labels and badges -// -------------------------------------------------- - - -// Base classes -.label, -.badge { - font-size: @baseFontSize * .846; - font-weight: bold; - line-height: 14px; // ensure proper line-height if floated - color: @white; - vertical-align: baseline; - white-space: nowrap; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - background-color: @grayLight; -} -// Set unique padding and border-radii -.label { - padding: 1px 4px 2px; - .border-radius(3px); -} -.badge { - padding: 1px 9px 2px; - .border-radius(9px); -} - -// Hover state, but only for links -a { - &.label:hover, - &.badge:hover { - color: @white; - text-decoration: none; - cursor: pointer; - } -} - -// Colors -// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute) -.label, -.badge { - // Important (red) - &-important { background-color: @errorText; } - &-important[href] { background-color: darken(@errorText, 10%); } - // Warnings (orange) - &-warning { background-color: @orange; } - &-warning[href] { background-color: darken(@orange, 10%); } - // Success (green) - &-success { background-color: @successText; } - &-success[href] { background-color: darken(@successText, 10%); } - // Info (turquoise) - &-info { background-color: @infoText; } - &-info[href] { background-color: darken(@infoText, 10%); } - // Inverse (black) - &-inverse { background-color: @grayDark; } - &-inverse[href] { background-color: darken(@grayDark, 10%); } -} - -// Quick fix for labels/badges in buttons -.btn { - .label, - .badge { - position: relative; - top: -1px; - } -} -.btn-mini { - .label, - .badge { - top: 0; - } -} -// -// Progress bars -// -------------------------------------------------- - - -// ANIMATIONS -// ---------- - -// Webkit -@-webkit-keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - -// Firefox -@-moz-keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - -// IE9 -@-ms-keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - -// Opera -@-o-keyframes progress-bar-stripes { - from { background-position: 0 0; } - to { background-position: 40px 0; } -} - -// Spec -@keyframes progress-bar-stripes { - from { background-position: 40px 0; } - to { background-position: 0 0; } -} - - - -// THE BARS -// -------- - -// Outer container -.progress { - overflow: hidden; - height: @baseLineHeight; - margin-bottom: @baseLineHeight; - #gradient > .vertical(#f5f5f5, #f9f9f9); - .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); - .border-radius(4px); -} - -// Bar of progress -.progress .bar { - width: 0%; - height: 100%; - color: @white; - float: left; - font-size: 12px; - text-align: center; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - #gradient > .vertical(#149bdf, #0480be); - .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); - .box-sizing(border-box); - .transition(width .6s ease); -} -.progress .bar + .bar { - .box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)); -} - -// Striped bars -.progress-striped .bar { - #gradient > .striped(#149bdf); - .background-size(40px 40px); -} - -// Call animation for the active one -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - - - -// COLORS -// ------ - -// Danger (red) -.progress-danger .bar, .progress .bar-danger { - #gradient > .vertical(#ee5f5b, #c43c35); -} -.progress-danger.progress-striped .bar, .progress-striped .bar-danger { - #gradient > .striped(#ee5f5b); -} - -// Success (green) -.progress-success .bar, .progress .bar-success { - #gradient > .vertical(#62c462, #57a957); -} -.progress-success.progress-striped .bar, .progress-striped .bar-success { - #gradient > .striped(#62c462); -} - -// Info (teal) -.progress-info .bar, .progress .bar-info { - #gradient > .vertical(#5bc0de, #339bb9); -} -.progress-info.progress-striped .bar, .progress-striped .bar-info { - #gradient > .striped(#5bc0de); -} - -// Warning (orange) -.progress-warning .bar, .progress .bar-warning { - #gradient > .vertical(lighten(@orange, 15%), @orange); -} -.progress-warning.progress-striped .bar, .progress-striped .bar-warning { - #gradient > .striped(lighten(@orange, 15%)); -} -// -// Accordion -// -------------------------------------------------- - - -// Parent container -.accordion { - margin-bottom: @baseLineHeight; -} - -// Group == heading + body -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - .border-radius(4px); -} -.accordion-heading { - border-bottom: 0; -} -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} - -// General toggle styles -.accordion-toggle { - cursor: pointer; -} - -// Inner needs the styles because you can't animate properly with any styles on the element -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} -// -// Carousel -// -------------------------------------------------- - - -.carousel { - position: relative; - margin-bottom: @baseLineHeight; - line-height: 1; -} - -.carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} - -.carousel { - - .item { - display: none; - position: relative; - .transition(.6s ease-in-out left); - } - - // Account for jankitude on images - .item > img { - display: block; - line-height: 1; - } - - .active, - .next, - .prev { display: block; } - - .active { - left: 0; - } - - .next, - .prev { - position: absolute; - top: 0; - width: 100%; - } - - .next { - left: 100%; - } - .prev { - left: -100%; - } - .next.left, - .prev.right { - left: 0; - } - - .active.left { - left: -100%; - } - .active.right { - left: 100%; - } - -} - -// Left/right controls for nav -// --------------------------- - -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: @white; - text-align: center; - background: @grayDarker; - border: 3px solid @white; - .border-radius(23px); - .opacity(50); - - // we can't have this transition here - // because webkit cancels the carousel - // animation if you trip this while - // in the middle of another animation - // ;_; - // .transition(opacity .2s linear); - - // Reposition the right one - &.right { - left: auto; - right: 15px; - } - - // Hover state - &:hover { - color: @white; - text-decoration: none; - .opacity(90); - } -} - - -// Caption for text below images -// ----------------------------- - -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 15px; - background: @grayDark; - background: rgba(0,0,0,.75); -} -.carousel-caption h4, -.carousel-caption p { - color: @white; - line-height: @baseLineHeight; -} -.carousel-caption h4 { - margin: 0 0 5px; -} -.carousel-caption p { - margin-bottom: 0; -} -// -// Hero unit -// -------------------------------------------------- - - -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: @heroUnitBackground; - .border-radius(6px); - h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - color: @heroUnitHeadingColor; - letter-spacing: -1px; - } - p { - font-size: 18px; - font-weight: 200; - line-height: @baseLineHeight * 1.5; - color: @heroUnitLeadColor; - } -} - -// Utility classes -// -// Utility classes -// -------------------------------------------------- - - -// Quick floats -.pull-right { - float: right; -} -.pull-left { - float: left; -} - -// Toggling content -.hide { - display: none; -} -.show { - display: block; -} - -// Visibility -.invisible { - visibility: hidden; -} - -// For Affix plugin -.affix { - position: fixed; -} +/*! + * Bootstrap v2.1.1 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ + +// CSS Reset +// +// Modals +// Adapted from http://github.com/necolas/normalize.css +// -------------------------------------------------- + + +// Display in IE6-9 and FF3 +// ------------------------- + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { + display: block; +} + +// Display block in IE6-9 and FF3 +// ------------------------- + +audio, +canvas, +video { + display: inline-block; + *display: inline; + *zoom: 1; +} + +// Prevents modern browsers from displaying 'audio' without controls +// ------------------------- + +audio:not([controls]) { + display: none; +} + +// Base settings +// ------------------------- + +html { + font-size: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +// Focus states +a:focus { + .tab-focus(); +} +// Hover & Active +a:hover, +a:active { + outline: 0; +} + +// Prevents sub and sup affecting line-height in all browsers +// ------------------------- + +sub, +sup { + position: relative; + font-size: 75%; + line-height: 0; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} + +// Img border in a's and image quality +// ------------------------- + +img { + /* Responsive images (ensure images don't scale beyond their parents) */ + max-width: 100%; /* Part 1: Set a maxium relative to the parent */ + width: auto\9; /* IE7-8 need help adjusting responsive images */ + height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */ + + vertical-align: middle; + border: 0; + -ms-interpolation-mode: bicubic; +} + +// Prevent max-width from affecting Google Maps +#map_canvas img { + max-width: none; +} + +// Forms +// ------------------------- + +// Font size in all browsers, margin changes, misc consistency +button, +input, +select, +textarea { + margin: 0; + font-size: 100%; + vertical-align: middle; +} +button, +input { + *overflow: visible; // Inner spacing ie IE6/7 + line-height: normal; // FF3/4 have !important on line-height in UA stylesheet +} +button::-moz-focus-inner, +input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 + padding: 0; + border: 0; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; // Cursors on all buttons applied consistently + -webkit-appearance: button; // Style clickable inputs in iOS +} +input[type="search"] { // Appearance in Safari/Chrome + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + -webkit-appearance: textfield; +} +input[type="search"]::-webkit-search-decoration, +input[type="search"]::-webkit-search-cancel-button { + -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 +} +textarea { + overflow: auto; // Remove vertical scrollbar in IE6-9 + vertical-align: top; // Readability and alignment cross-browser +} + +// Core variables and mixins +// +// Variables +// -------------------------------------------------- + + +// Global values +// -------------------------------------------------- + + +// Grays +// ------------------------- +@black: #000; +@grayDarker: #222; +@grayDark: #333; +@gray: #555; +@grayLight: #999; +@grayLighter: #eee; +@white: #fff; + + +// Accent colors +// ------------------------- +@blue: #049cdb; +@blueDark: #0064cd; +@green: #46a546; +@red: #9d261d; +@yellow: #ffc40d; +@orange: #f89406; +@pink: #c3325f; +@purple: #7a43b6; + + +// Scaffolding +// ------------------------- +@bodyBackground: @white; +@textColor: @grayDark; + + +// Links +// ------------------------- +@linkColor: #08c; +@linkColorHover: darken(@linkColor, 15%); + + +// Typography +// ------------------------- +@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@serifFontFamily: Georgia, "Times New Roman", Times, serif; +@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace; + +@baseFontSize: 14px; +@baseFontFamily: @sansFontFamily; +@baseLineHeight: 20px; +@altFontFamily: @serifFontFamily; + +@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily +@headingsFontWeight: bold; // instead of browser default, bold +@headingsColor: inherit; // empty to use BS default, @textColor + +// Tables +// ------------------------- +@tableBackground: transparent; // overall background-color +@tableBackgroundAccent: #f9f9f9; // for striping +@tableBackgroundHover: #f5f5f5; // for hover +@tableBorder: #ddd; // table and cell border + +// Buttons +// ------------------------- +@btnBackground: @white; +@btnBackgroundHighlight: darken(@white, 10%); +@btnBorder: #bbb; + +@btnPrimaryBackground: @linkColor; +@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); + +@btnInfoBackground: #5bc0de; +@btnInfoBackgroundHighlight: #2f96b4; + +@btnSuccessBackground: #62c462; +@btnSuccessBackgroundHighlight: #51a351; + +@btnWarningBackground: lighten(@orange, 15%); +@btnWarningBackgroundHighlight: @orange; + +@btnDangerBackground: #ee5f5b; +@btnDangerBackgroundHighlight: #bd362f; + +@btnInverseBackground: #444; +@btnInverseBackgroundHighlight: @grayDarker; + + +// Forms +// ------------------------- +@inputBackground: @white; +@inputBorder: #ccc; +@inputBorderRadius: 3px; +@inputDisabledBackground: @grayLighter; +@formActionsBackground: #f5f5f5; + +// Dropdowns +// ------------------------- +@dropdownBackground: @white; +@dropdownBorder: rgba(0,0,0,.2); +@dropdownDividerTop: #e5e5e5; +@dropdownDividerBottom: @white; + +@dropdownLinkColor: @grayDark; +@dropdownLinkColorHover: @white; +@dropdownLinkColorActive: @dropdownLinkColor; + +@dropdownLinkBackgroundActive: @linkColor; +@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; + + + +// COMPONENT VARIABLES +// -------------------------------------------------- + +// Z-index master list +// ------------------------- +// Used for a bird's eye view of components dependent on the z-axis +// Try to avoid customizing these :) +@zindexDropdown: 1000; +@zindexPopover: 1010; +@zindexTooltip: 1030; +@zindexFixedNavbar: 1030; +@zindexModalBackdrop: 1040; +@zindexModal: 1050; + + +// Sprite icons path +// ------------------------- +@iconSpritePath: "../img/glyphicons-halflings.png"; +@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; + + +// Input placeholder text color +// ------------------------- +@placeholderText: @grayLight; + + +// Hr border color +// ------------------------- +@hrBorder: @grayLighter; + + +// Horizontal forms & lists +// ------------------------- +@horizontalComponentOffset: 180px; + + +// Wells +// ------------------------- +@wellBackground: #f5f5f5; + + +// Navbar +// ------------------------- +@navbarCollapseWidth: 979px; + +@navbarHeight: 40px; +@navbarBackgroundHighlight: #ffffff; +@navbarBackground: darken(@navbarBackgroundHighlight, 5%); +@navbarBorder: darken(@navbarBackground, 12%); + +@navbarText: #777; +@navbarLinkColor: #777; +@navbarLinkColorHover: @grayDark; +@navbarLinkColorActive: @gray; +@navbarLinkBackgroundHover: transparent; +@navbarLinkBackgroundActive: darken(@navbarBackground, 5%); + +@navbarBrandColor: @navbarLinkColor; + +// Inverted navbar +@navbarInverseBackground: #111111; +@navbarInverseBackgroundHighlight: #222222; +@navbarInverseBorder: #252525; + +@navbarInverseText: @grayLight; +@navbarInverseLinkColor: @grayLight; +@navbarInverseLinkColorHover: @white; +@navbarInverseLinkColorActive: @navbarInverseLinkColorHover; +@navbarInverseLinkBackgroundHover: transparent; +@navbarInverseLinkBackgroundActive: @navbarInverseBackground; + +@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%); +@navbarInverseSearchBackgroundFocus: @white; +@navbarInverseSearchBorder: @navbarInverseBackground; +@navbarInverseSearchPlaceholderColor: #ccc; + +@navbarInverseBrandColor: @navbarInverseLinkColor; + + +// Pagination +// ------------------------- +@paginationBackground: #fff; +@paginationBorder: #ddd; +@paginationActiveBackground: #f5f5f5; + + +// Hero unit +// ------------------------- +@heroUnitBackground: @grayLighter; +@heroUnitHeadingColor: inherit; +@heroUnitLeadColor: inherit; + + +// Form states and alerts +// ------------------------- +@warningText: #c09853; +@warningBackground: #fcf8e3; +@warningBorder: darken(spin(@warningBackground, -10), 3%); + +@errorText: #b94a48; +@errorBackground: #f2dede; +@errorBorder: darken(spin(@errorBackground, -10), 3%); + +@successText: #468847; +@successBackground: #dff0d8; +@successBorder: darken(spin(@successBackground, -10), 5%); + +@infoText: #3a87ad; +@infoBackground: #d9edf7; +@infoBorder: darken(spin(@infoBackground, -10), 7%); + + +// Tooltips and popovers +// ------------------------- +@tooltipColor: #fff; +@tooltipBackground: #000; +@tooltipArrowWidth: 5px; +@tooltipArrowColor: @tooltipBackground; + +@popoverBackground: #fff; +@popoverArrowWidth: 10px; +@popoverArrowColor: #fff; +@popoverTitleBackground: darken(@popoverBackground, 3%); + +// Special enhancement for popovers +@popoverArrowOuterWidth: @popoverArrowWidth + 1; +@popoverArrowOuterColor: rgba(0,0,0,.25); + + + +// GRID +// -------------------------------------------------- + + +// Default 940px grid +// ------------------------- +@gridColumns: 12; +@gridColumnWidth: 60px; +@gridGutterWidth: 20px; +@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); + +// 1200px min +@gridColumnWidth1200: 70px; +@gridGutterWidth1200: 30px; +@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1)); + +// 768px-979px +@gridColumnWidth768: 42px; +@gridGutterWidth768: 20px; +@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1)); + + +// Fluid grid +// ------------------------- +@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth); +@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth); + +// 1200px min +@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200); +@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200); + +// 768px-979px +@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768); +@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768); +// +// Mixins +// -------------------------------------------------- + + +// UTILITY MIXINS +// -------------------------------------------------- + +// Clearfix +// -------- +// For clearing floats like a boss h5bp.com/q +.clearfix { + *zoom: 1; + &:before, + &:after { + display: table; + content: ""; + // Fixes Opera/contenteditable bug: + // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952 + line-height: 0; + } + &:after { + clear: both; + } +} + +// Webkit-style focus +// ------------------ +.tab-focus() { + // Default + outline: thin dotted #333; + // Webkit + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} + +// Center-align a block level element +// ---------------------------------- +.center-block() { + display: block; + margin-left: auto; + margin-right: auto; +} + +// IE7 inline-block +// ---------------- +.ie7-inline-block() { + *display: inline; /* IE7 inline-block hack */ + *zoom: 1; +} + +// IE7 likes to collapse whitespace on either side of the inline-block elements. +// Ems because we're attempting to match the width of a space character. Left +// version is for form buttons, which typically come after other elements, and +// right version is for icons, which come before. Applying both is ok, but it will +// mean that space between those elements will be .6em (~2 space characters) in IE7, +// instead of the 1 space in other browsers. +.ie7-restore-left-whitespace() { + *margin-left: .3em; + + &:first-child { + *margin-left: 0; + } +} + +.ie7-restore-right-whitespace() { + *margin-right: .3em; +} + +// Sizing shortcuts +// ------------------------- +.size(@height, @width) { + width: @width; + height: @height; +} +.square(@size) { + .size(@size, @size); +} + +// Placeholder text +// ------------------------- +.placeholder(@color: @placeholderText) { + &:-moz-placeholder { + color: @color; + } + &:-ms-input-placeholder { + color: @color; + } + &::-webkit-input-placeholder { + color: @color; + } +} + +// Text overflow +// ------------------------- +// Requires inline-block or block for proper styling +.text-overflow() { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +// CSS image replacement +// ------------------------- +// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 +.hide-text { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} + + +// FONTS +// -------------------------------------------------- + +#font { + #family { + .serif() { + font-family: @serifFontFamily; + } + .sans-serif() { + font-family: @sansFontFamily; + } + .monospace() { + font-family: @monoFontFamily; + } + } + .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { + font-size: @size; + font-weight: @weight; + line-height: @lineHeight; + } + .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { + #font > #family > .serif; + #font > .shorthand(@size, @weight, @lineHeight); + } + .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { + #font > #family > .sans-serif; + #font > .shorthand(@size, @weight, @lineHeight); + } + .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) { + #font > #family > .monospace; + #font > .shorthand(@size, @weight, @lineHeight); + } +} + + +// FORMS +// -------------------------------------------------- + +// Block level inputs +.input-block-level { + display: block; + width: 100%; + min-height: 30px; // Make inputs at least the height of their button counterpart + .box-sizing(border-box); // Makes inputs behave like true block-level elements +} + + + +// Mixin for form field states +.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) { + // Set the text color + > label, + .help-block, + .help-inline { + color: @textColor; + } + // Style inputs accordingly + .checkbox, + .radio, + input, + select, + textarea { + color: @textColor; + } + input, + select, + textarea { + border-color: @borderColor; + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work + &:focus { + border-color: darken(@borderColor, 10%); + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%)); + } + } + // Give a small background color for input-prepend/-append + .input-prepend .add-on, + .input-append .add-on { + color: @textColor; + background-color: @backgroundColor; + border-color: @textColor; + } +} + + + +// CSS3 PROPERTIES +// -------------------------------------------------- + +// Border Radius +.border-radius(@radius) { + -webkit-border-radius: @radius; + -moz-border-radius: @radius; + border-radius: @radius; +} + +// Single Corner Border Radius +.border-top-left-radius(@radius) { + -webkit-border-top-left-radius: @radius; + -moz-border-radius-topleft: @radius; + border-top-left-radius: @radius; +} +.border-top-right-radius(@radius) { + -webkit-border-top-right-radius: @radius; + -moz-border-radius-topright: @radius; + border-top-right-radius: @radius; +} +.border-bottom-right-radius(@radius) { + -webkit-border-bottom-right-radius: @radius; + -moz-border-radius-bottomright: @radius; + border-bottom-right-radius: @radius; +} +.border-bottom-left-radius(@radius) { + -webkit-border-bottom-left-radius: @radius; + -moz-border-radius-bottomleft: @radius; + border-bottom-left-radius: @radius; +} + +// Single Side Border Radius +.border-top-radius(@radius) { + .border-top-right-radius(@radius); + .border-top-left-radius(@radius); +} +.border-right-radius(@radius) { + .border-top-right-radius(@radius); + .border-bottom-right-radius(@radius); +} +.border-bottom-radius(@radius) { + .border-bottom-right-radius(@radius); + .border-bottom-left-radius(@radius); +} +.border-left-radius(@radius) { + .border-top-left-radius(@radius); + .border-bottom-left-radius(@radius); +} + +// Drop shadows +.box-shadow(@shadowA, @shadowB:X, ...){ + // Multiple shadow solution from http://toekneestuck.com/blog/2012/05/15/less-css-arguments-variable/ + @props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`; + -webkit-box-shadow: @props; + -moz-box-shadow: @props; + box-shadow: @props; +} + +// Transitions +.transition(@transition) { + -webkit-transition: @transition; + -moz-transition: @transition; + -o-transition: @transition; + transition: @transition; +} +.transition-delay(@transition-delay) { + -webkit-transition-delay: @transition-delay; + -moz-transition-delay: @transition-delay; + -o-transition-delay: @transition-delay; + transition-delay: @transition-delay; +} + +// Transformations +.rotate(@degrees) { + -webkit-transform: rotate(@degrees); + -moz-transform: rotate(@degrees); + -ms-transform: rotate(@degrees); + -o-transform: rotate(@degrees); + transform: rotate(@degrees); +} +.scale(@ratio) { + -webkit-transform: scale(@ratio); + -moz-transform: scale(@ratio); + -ms-transform: scale(@ratio); + -o-transform: scale(@ratio); + transform: scale(@ratio); +} +.translate(@x, @y) { + -webkit-transform: translate(@x, @y); + -moz-transform: translate(@x, @y); + -ms-transform: translate(@x, @y); + -o-transform: translate(@x, @y); + transform: translate(@x, @y); +} +.skew(@x, @y) { + -webkit-transform: skew(@x, @y); + -moz-transform: skew(@x, @y); + -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885 + -o-transform: skew(@x, @y); + transform: skew(@x, @y); +} +.translate3d(@x, @y, @z) { + -webkit-transform: translate3d(@x, @y, @z); + -moz-transform: translate3d(@x, @y, @z); + -o-transform: translate3d(@x, @y, @z); + transform: translate3d(@x, @y, @z); +} + +// Backface visibility +// Prevent browsers from flickering when using CSS 3D transforms. +// Default value is `visible`, but can be changed to `hidden +// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples +.backface-visibility(@visibility){ + -webkit-backface-visibility: @visibility; + -moz-backface-visibility: @visibility; + backface-visibility: @visibility; +} + +// Background clipping +// Heads up: FF 3.6 and under need "padding" instead of "padding-box" +.background-clip(@clip) { + -webkit-background-clip: @clip; + -moz-background-clip: @clip; + background-clip: @clip; +} + +// Background sizing +.background-size(@size){ + -webkit-background-size: @size; + -moz-background-size: @size; + -o-background-size: @size; + background-size: @size; +} + + +// Box sizing +.box-sizing(@boxmodel) { + -webkit-box-sizing: @boxmodel; + -moz-box-sizing: @boxmodel; + box-sizing: @boxmodel; +} + +// User select +// For selecting text on the page +.user-select(@select) { + -webkit-user-select: @select; + -moz-user-select: @select; + -ms-user-select: @select; + -o-user-select: @select; + user-select: @select; +} + +// Resize anything +.resizable(@direction) { + resize: @direction; // Options: horizontal, vertical, both + overflow: auto; // Safari fix +} + +// CSS3 Content Columns +.content-columns(@columnCount, @columnGap: @gridGutterWidth) { + -webkit-column-count: @columnCount; + -moz-column-count: @columnCount; + column-count: @columnCount; + -webkit-column-gap: @columnGap; + -moz-column-gap: @columnGap; + column-gap: @columnGap; +} + +// Optional hyphenation +.hyphens(@mode: auto) { + word-wrap: break-word; + -webkit-hyphens: @mode; + -moz-hyphens: @mode; + -ms-hyphens: @mode; + -o-hyphens: @mode; + hyphens: @mode; +} + +// Opacity +.opacity(@opacity) { + opacity: @opacity / 100; + filter: ~"alpha(opacity=@{opacity})"; +} + + + +// BACKGROUNDS +// -------------------------------------------------- + +// Add an alphatransparency value to any background or border color (via Elyse Holladay) +#translucent { + .background(@color: @white, @alpha: 1) { + background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); + } + .border(@color: @white, @alpha: 1) { + border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); + .background-clip(padding-box); + } +} + +// Gradient Bar Colors for buttons and alerts +.gradientBar(@primaryColor, @secondaryColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) { + color: @textColor; + text-shadow: @textShadow; + #gradient > .vertical(@primaryColor, @secondaryColor); + border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); +} + +// Gradients +#gradient { + .horizontal(@startColor: #555, @endColor: #333) { + background-color: @endColor; + background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10 + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down + } + .vertical(@startColor: #555, @endColor: #333) { + background-color: mix(@startColor, @endColor, 60%); + background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ + background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 + background-repeat: repeat-x; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down + } + .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { + background-color: @endColor; + background-repeat: repeat-x; + background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ + background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ + background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 + background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10 + } + .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { + background-color: mix(@midColor, @endColor, 80%); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); + background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); + background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); + background-repeat: no-repeat; + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback + } + .radial(@innerColor: #555, @outerColor: #333) { + background-color: @outerColor; + background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); + background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); + background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); + background-image: -o-radial-gradient(circle, @innerColor, @outerColor); + background-repeat: no-repeat; + } + .striped(@color: #555, @angle: 45deg) { + background-color: @color; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); + } +} +// Reset filters for IE +.reset-filter() { + filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)")); +} + + + +// COMPONENT MIXINS +// -------------------------------------------------- + +// Horizontal dividers +// ------------------------- +// Dividers (basically an hr) within dropdowns and nav lists +.nav-divider(@top: #e5e5e5, @bottom: @white) { + // IE7 needs a set width since we gave a height. Restricting just + // to IE7 to keep the 1px left/right space in other browsers. + // It is unclear where IE is getting the extra space that we need + // to negative-margin away, but so it goes. + *width: 100%; + height: 1px; + margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px + *margin: -5px 0 5px; + overflow: hidden; + background-color: @top; + border-bottom: 1px solid @bottom; +} + +// Button backgrounds +// ------------------ +.buttonBackground(@startColor, @endColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) { + // gradientBar will set the background to a pleasing blend of these, to support IE<=9 + .gradientBar(@startColor, @endColor, @textColor, @textShadow); + *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + .reset-filter(); + + // in these cases the gradient won't cover the background, so we override + &:hover, &:active, &.active, &.disabled, &[disabled] { + color: @textColor; + background-color: @endColor; + *background-color: darken(@endColor, 5%); + } + + // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves + &:active, + &.active { + background-color: darken(@endColor, 10%) e("\9"); + } +} + +// Navbar vertical align +// ------------------------- +// Vertically center elements in the navbar. +// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin. +.navbarVerticalAlign(@elementHeight) { + margin-top: (@navbarHeight - @elementHeight) / 2; +} + + + +// Grid System +// ----------- + +// Centered container element +.container-fixed() { + margin-right: auto; + margin-left: auto; + .clearfix(); +} + +// Table columns +.tableColumns(@columnSpan: 1) { + float: none; // undo default grid column styles + width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells + margin-left: 0; // undo default grid column styles +} + +// Make a Grid +// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior +.makeRow() { + margin-left: @gridGutterWidth * -1; + .clearfix(); +} +.makeColumn(@columns: 1, @offset: 0) { + float: left; + margin-left: (@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2); + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); +} + +// The Grid +#grid { + + .core (@gridColumnWidth, @gridGutterWidth) { + + .spanX (@index) when (@index > 0) { + (~".span@{index}") { .span(@index); } + .spanX(@index - 1); + } + .spanX (0) {} + + .offsetX (@index) when (@index > 0) { + (~".offset@{index}") { .offset(@index); } + .offsetX(@index - 1); + } + .offsetX (0) {} + + .offset (@columns) { + margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1)); + } + + .span (@columns) { + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); + } + + .row { + margin-left: @gridGutterWidth * -1; + .clearfix(); + } + + [class*="span"] { + float: left; + min-height: 1px; // prevent collapsing columns + margin-left: @gridGutterWidth; + } + + // Set the container width, and override it for fixed navbars in media queries + .container, + .navbar-static-top .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { .span(@gridColumns); } + + // generate .spanX and .offsetX + .spanX (@gridColumns); + .offsetX (@gridColumns); + + } + + .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) { + + .spanX (@index) when (@index > 0) { + (~".span@{index}") { .span(@index); } + .spanX(@index - 1); + } + .spanX (0) {} + + .offsetX (@index) when (@index > 0) { + (~'.offset@{index}') { .offset(@index); } + (~'.offset@{index}:first-child') { .offsetFirstChild(@index); } + .offsetX(@index - 1); + } + .offsetX (0) {} + + .offset (@columns) { + margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2); + *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%); + } + + .offsetFirstChild (@columns) { + margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth); + *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%); + } + + .span (@columns) { + width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)); + *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%); + } + + .row-fluid { + width: 100%; + .clearfix(); + [class*="span"] { + .input-block-level(); + float: left; + margin-left: @fluidGridGutterWidth; + *margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%); + } + [class*="span"]:first-child { + margin-left: 0; + } + + // generate .spanX and .offsetX + .spanX (@gridColumns); + .offsetX (@gridColumns); + } + + } + + .input(@gridColumnWidth, @gridGutterWidth) { + + .spanX (@index) when (@index > 0) { + (~"input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index}") { .span(@index); } + .spanX(@index - 1); + } + .spanX (0) {} + + .span(@columns) { + width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 14; + } + + input, + textarea, + .uneditable-input { + margin-left: 0; // override margin-left from core grid system + } + + // Space grid-sized controls properly if multiple per line + .controls-row [class*="span"] + [class*="span"] { + margin-left: @gridGutterWidth; + } + + // generate .spanX + .spanX (@gridColumns); + + } + +} + +// Grid system and page structure +// +// Scaffolding +// -------------------------------------------------- + + +// Body reset +// ------------------------- + +body { + margin: 0; + font-family: @baseFontFamily; + font-size: @baseFontSize; + line-height: @baseLineHeight; + color: @textColor; + background-color: @bodyBackground; +} + + +// Links +// ------------------------- + +a { + color: @linkColor; + text-decoration: none; +} +a:hover { + color: @linkColorHover; + text-decoration: underline; +} + + +// Images +// ------------------------- + +// Rounded corners +.img-rounded { + .border-radius(6px); +} + +// Add polaroid-esque trim +.img-polaroid { + padding: 4px; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.2); + .box-shadow(0 1px 3px rgba(0,0,0,.1)); +} + +// Perfect circle +.img-circle { + .border-radius(500px); // crank the border-radius so it works with most reasonably sized images +} +// +// Grid system +// -------------------------------------------------- + + +// Fixed (940px) +#grid > .core(@gridColumnWidth, @gridGutterWidth); + +// Fluid (940px) +#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth); + +// Reset utility classes due to specificity +[class*="span"].hide, +.row-fluid [class*="span"].hide { + display: none; +} + +[class*="span"].pull-right, +.row-fluid [class*="span"].pull-right { + float: right; +} +// +// Layouts +// -------------------------------------------------- + + +// Container (centered, fixed-width layouts) +.container { + .container-fixed(); +} + +// Fluid layouts (left aligned, with sidebar, min- & max-width content) +.container-fluid { + padding-right: @gridGutterWidth; + padding-left: @gridGutterWidth; + .clearfix(); +} +// Base CSS +// +// Typography +// -------------------------------------------------- + + +// Body text +// ------------------------- + +p { + margin: 0 0 @baseLineHeight / 2; +} +.lead { + margin-bottom: @baseLineHeight; + font-size: @baseFontSize * 1.5; + font-weight: 200; + line-height: @baseLineHeight * 1.5; +} + + +// Emphasis & misc +// ------------------------- + +small { + font-size: 85%; // Ex: 14px base font * 85% = about 12px +} +strong { + font-weight: bold; +} +em { + font-style: italic; +} +cite { + font-style: normal; +} + +// Utility classes +.muted { + color: @grayLight; +} +.text-warning { + color: @warningText; +} +.text-error { + color: @errorText; +} +.text-info { + color: @infoText; +} +.text-success { + color: @successText; +} + + +// Headings +// ------------------------- + +h1, h2, h3, h4, h5, h6 { + margin: (@baseLineHeight / 2) 0; + font-family: @headingsFontFamily; + font-weight: @headingsFontWeight; + line-height: 1; + color: @headingsColor; + text-rendering: optimizelegibility; // Fix the character spacing for headings + small { + font-weight: normal; + line-height: 1; + color: @grayLight; + } +} +h1 { font-size: 36px; line-height: 40px; } +h2 { font-size: 30px; line-height: 40px; } +h3 { font-size: 24px; line-height: 40px; } +h4 { font-size: 18px; line-height: 20px; } +h5 { font-size: 14px; line-height: 20px; } +h6 { font-size: 12px; line-height: 20px; } + +h1 small { font-size: 24px; } +h2 small { font-size: 18px; } +h3 small { font-size: 14px; } +h4 small { font-size: 14px; } + + +// Page header +// ------------------------- + +.page-header { + padding-bottom: (@baseLineHeight / 2) - 1; + margin: @baseLineHeight 0 (@baseLineHeight * 1.5); + border-bottom: 1px solid @grayLighter; +} + + + +// Lists +// -------------------------------------------------- + +// Unordered and Ordered lists +ul, ol { + padding: 0; + margin: 0 0 @baseLineHeight / 2 25px; +} +ul ul, +ul ol, +ol ol, +ol ul { + margin-bottom: 0; +} +li { + line-height: @baseLineHeight; +} +ul.unstyled, +ol.unstyled { + margin-left: 0; + list-style: none; +} + +// Description Lists +dl { + margin-bottom: @baseLineHeight; +} +dt, +dd { + line-height: @baseLineHeight; +} +dt { + font-weight: bold; +} +dd { + margin-left: @baseLineHeight / 2; +} +// Horizontal layout (like forms) +.dl-horizontal { + .clearfix(); // Ensure dl clears floats if empty dd elements present + dt { + float: left; + width: @horizontalComponentOffset - 20; + clear: left; + text-align: right; + .text-overflow(); + } + dd { + margin-left: @horizontalComponentOffset; + } +} + +// MISC +// ---- + +// Horizontal rules +hr { + margin: @baseLineHeight 0; + border: 0; + border-top: 1px solid @hrBorder; + border-bottom: 1px solid @white; +} + +// Abbreviations and acronyms +abbr[title] { + cursor: help; + border-bottom: 1px dotted @grayLight; +} +abbr.initialism { + font-size: 90%; + text-transform: uppercase; +} + +// Blockquotes +blockquote { + padding: 0 0 0 15px; + margin: 0 0 @baseLineHeight; + border-left: 5px solid @grayLighter; + p { + margin-bottom: 0; + #font > .shorthand(16px,300,@baseLineHeight * 1.25); + } + small { + display: block; + line-height: @baseLineHeight; + color: @grayLight; + &:before { + content: '\2014 \00A0'; + } + } + + // Float right with text-align: right + &.pull-right { + float: right; + padding-right: 15px; + padding-left: 0; + border-right: 5px solid @grayLighter; + border-left: 0; + p, + small { + text-align: right; + } + small { + &:before { + content: ''; + } + &:after { + content: '\00A0 \2014'; + } + } + } +} + +// Quotes +q:before, +q:after, +blockquote:before, +blockquote:after { + content: ""; +} + +// Addresses +address { + display: block; + margin-bottom: @baseLineHeight; + font-style: normal; + line-height: @baseLineHeight; +} +// +// Code (inline and blocK) +// -------------------------------------------------- + + +// Inline and block code styles +code, +pre { + padding: 0 3px 2px; + #font > #family > .monospace; + font-size: @baseFontSize - 2; + color: @grayDark; + .border-radius(3px); +} + +// Inline code +code { + padding: 2px 4px; + color: #d14; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; +} + +// Blocks of code +pre { + display: block; + padding: (@baseLineHeight - 1) / 2; + margin: 0 0 @baseLineHeight / 2; + font-size: @baseFontSize - 1; // 14px to 13px + line-height: @baseLineHeight; + word-break: break-all; + word-wrap: break-word; + white-space: pre; + white-space: pre-wrap; + background-color: #f5f5f5; + border: 1px solid #ccc; // fallback for IE7-8 + border: 1px solid rgba(0,0,0,.15); + .border-radius(4px); + + // Make prettyprint styles more spaced out for readability + &.prettyprint { + margin-bottom: @baseLineHeight; + } + + // Account for some code outputs that place code tags in pre tags + code { + padding: 0; + color: inherit; + background-color: transparent; + border: 0; + } +} + +// Enable scrollable blocks of code +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} // +// Forms +// -------------------------------------------------- + + +// GENERAL STYLES +// -------------- + +// Make all forms have space below them +form { + margin: 0 0 @baseLineHeight; +} + +fieldset { + padding: 0; + margin: 0; + border: 0; +} + +// Groups of fields with labels on top (legends) +legend { + display: block; + width: 100%; + padding: 0; + margin-bottom: @baseLineHeight; + font-size: @baseFontSize * 1.5; + line-height: @baseLineHeight * 2; + color: @grayDark; + border: 0; + border-bottom: 1px solid #e5e5e5; + + // Small + small { + font-size: @baseLineHeight * .75; + color: @grayLight; + } +} + +// Set font for forms +label, +input, +button, +select, +textarea { + #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here +} +input, +button, +select, +textarea { + font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element) +} + +// Identify controls by their labels +label { + display: block; + margin-bottom: 5px; +} + +// Form controls +// ------------------------- + +// Shared size and type resets +select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + display: inline-block; + height: @baseLineHeight; + padding: 4px 6px; + margin-bottom: 9px; + font-size: @baseFontSize; + line-height: @baseLineHeight; + color: @gray; + .border-radius(@inputBorderRadius); +} + +// Reset appearance properties for textual inputs and textarea +// Declare width for legacy (can't be on input[type=*] selectors or it's too specific) +input, +textarea, +.uneditable-input { + width: 206px; // plus 12px padding and 2px border +} +// Reset height since textareas have rows +textarea { + height: auto; +} +// Everything else +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +input[type="search"], +input[type="tel"], +input[type="color"], +.uneditable-input { + background-color: @inputBackground; + border: 1px solid @inputBorder; + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); + .transition(~"border linear .2s, box-shadow linear .2s"); + + // Focus state + &:focus { + border-color: rgba(82,168,236,.8); + outline: 0; + outline: thin dotted \9; /* IE6-9 */ + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)); + } +} + +// Position radios and checkboxes better +input[type="radio"], +input[type="checkbox"] { + margin: 4px 0 0; + *margin-top: 0; /* IE7 */ + margin-top: 1px \9; /* IE8-9 */ + line-height: normal; + cursor: pointer; +} + +// Reset width of input images, buttons, radios, checkboxes +input[type="file"], +input[type="image"], +input[type="submit"], +input[type="reset"], +input[type="button"], +input[type="radio"], +input[type="checkbox"] { + width: auto; // Override of generic input selector +} + +// Set the height of select and file controls to match text inputs +select, +input[type="file"] { + height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */ + *margin-top: 4px; /* For IE7, add top margin to align select with labels */ + line-height: 30px; +} + +// Make select elements obey height by applying a border +select { + width: 220px; // default input width + 10px of padding that doesn't get applied + border: 1px solid @inputBorder; + background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color +} + +// Make multiple select elements height not fixed +select[multiple], +select[size] { + height: auto; +} + +// Focus for select, file, radio, and checkbox +select:focus, +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus { + .tab-focus(); +} + + +// Uneditable inputs +// ------------------------- + +// Make uneditable inputs look inactive +.uneditable-input, +.uneditable-textarea { + color: @grayLight; + background-color: darken(@inputBackground, 1%); + border-color: @inputBorder; + .box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); + cursor: not-allowed; +} + +// For text that needs to appear as an input but should not be an input +.uneditable-input { + overflow: hidden; // prevent text from wrapping, but still cut it off like an input does + white-space: nowrap; +} + +// Make uneditable textareas behave like a textarea +.uneditable-textarea { + width: auto; + height: auto; +} + + +// Placeholder +// ------------------------- + +// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector +input, +textarea { + .placeholder(); +} + + +// CHECKBOXES & RADIOS +// ------------------- + +// Indent the labels to position radios/checkboxes as hanging +.radio, +.checkbox { + min-height: 18px; // clear the floating input if there is no label text + padding-left: 18px; +} +.radio input[type="radio"], +.checkbox input[type="checkbox"] { + float: left; + margin-left: -18px; +} + +// Move the options list down to align with labels +.controls > .radio:first-child, +.controls > .checkbox:first-child { + padding-top: 5px; // has to be padding because margin collaspes +} + +// Radios and checkboxes on same line +// TODO v3: Convert .inline to .control-inline +.radio.inline, +.checkbox.inline { + display: inline-block; + padding-top: 5px; + margin-bottom: 0; + vertical-align: middle; +} +.radio.inline + .radio.inline, +.checkbox.inline + .checkbox.inline { + margin-left: 10px; // space out consecutive inline controls +} + + + +// INPUT SIZES +// ----------- + +// General classes for quick sizes +.input-mini { width: 60px; } +.input-small { width: 90px; } +.input-medium { width: 150px; } +.input-large { width: 210px; } +.input-xlarge { width: 270px; } +.input-xxlarge { width: 530px; } + +// Grid style input sizes +input[class*="span"], +select[class*="span"], +textarea[class*="span"], +.uneditable-input[class*="span"], +// Redeclare since the fluid row class is more specific +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"] { + float: none; + margin-left: 0; +} +// Ensure input-prepend/append never wraps +.input-append input[class*="span"], +.input-append .uneditable-input[class*="span"], +.input-prepend input[class*="span"], +.input-prepend .uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"], +.row-fluid .input-prepend [class*="span"], +.row-fluid .input-append [class*="span"] { + display: inline-block; +} + + + +// GRID SIZING FOR INPUTS +// ---------------------- + +// Grid sizes +#grid > .input(@gridColumnWidth, @gridGutterWidth); + +// Control row for multiple inputs per line +.controls-row { + .clearfix(); // Clear the float from controls +} +.controls-row [class*="span"] { + float: left; // Float to collapse white-space for proper grid alignment +} + + + + +// DISABLED STATE +// -------------- + +// Disabled and read-only inputs +input[disabled], +select[disabled], +textarea[disabled], +input[readonly], +select[readonly], +textarea[readonly] { + cursor: not-allowed; + background-color: @inputDisabledBackground; +} +// Explicitly reset the colors here +input[type="radio"][disabled], +input[type="checkbox"][disabled], +input[type="radio"][readonly], +input[type="checkbox"][readonly] { + background-color: transparent; +} + + + + +// FORM FIELD FEEDBACK STATES +// -------------------------- + +// Warning +.control-group.warning { + .formFieldState(@warningText, @warningText, @warningBackground); +} +// Error +.control-group.error { + .formFieldState(@errorText, @errorText, @errorBackground); +} +// Success +.control-group.success { + .formFieldState(@successText, @successText, @successBackground); +} +// Success +.control-group.info { + .formFieldState(@infoText, @infoText, @infoBackground); +} + +// HTML5 invalid states +// Shares styles with the .control-group.error above +input:focus:required:invalid, +textarea:focus:required:invalid, +select:focus:required:invalid { + color: #b94a48; + border-color: #ee5f5b; + &:focus { + border-color: darken(#ee5f5b, 10%); + .box-shadow(0 0 6px lighten(#ee5f5b, 20%)); + } +} + + + +// FORM ACTIONS +// ------------ + +.form-actions { + padding: (@baseLineHeight - 1) 20px @baseLineHeight; + margin-top: @baseLineHeight; + margin-bottom: @baseLineHeight; + background-color: @formActionsBackground; + border-top: 1px solid #e5e5e5; + .clearfix(); // Adding clearfix to allow for .pull-right button containers +} + + + +// HELP TEXT +// --------- + +.help-block, +.help-inline { + color: lighten(@textColor, 15%); // lighten the text some for contrast +} + +.help-block { + display: block; // account for any element using help-block + margin-bottom: @baseLineHeight / 2; +} + +.help-inline { + display: inline-block; + .ie7-inline-block(); + vertical-align: middle; + padding-left: 5px; +} + + + +// INPUT GROUPS +// ------------ + +// Allow us to put symbols and text within the input field for a cleaner look +.input-append, +.input-prepend { + margin-bottom: 5px; + font-size: 0; + white-space: nowrap; // Prevent span and input from separating + + input, + select, + .uneditable-input { + position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness + margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms + *margin-left: 0; + font-size: @baseFontSize; + vertical-align: top; + .border-radius(0 @inputBorderRadius @inputBorderRadius 0); + // Make input on top when focused so blue border and shadow always show + &:focus { + z-index: 2; + } + } + .add-on { + display: inline-block; + width: auto; + height: @baseLineHeight; + min-width: 16px; + padding: 4px 5px; + font-size: @baseFontSize; + font-weight: normal; + line-height: @baseLineHeight; + text-align: center; + text-shadow: 0 1px 0 @white; + background-color: @grayLighter; + border: 1px solid #ccc; + } + .add-on, + .btn { + vertical-align: top; + .border-radius(0); + } + .active { + background-color: lighten(@green, 30); + border-color: @green; + } +} +.input-prepend { + .add-on, + .btn { + margin-right: -1px; + } + .add-on:first-child, + .btn:first-child { + .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); + } +} +.input-append { + input, + select, + .uneditable-input { + .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); + } + .add-on, + .btn { + margin-left: -1px; + } + .add-on:last-child, + .btn:last-child { + .border-radius(0 @inputBorderRadius @inputBorderRadius 0); + } +} +// Remove all border-radius for inputs with both prepend and append +.input-prepend.input-append { + input, + select, + .uneditable-input { + .border-radius(0); + } + .add-on:first-child, + .btn:first-child { + margin-right: -1px; + .border-radius(@inputBorderRadius 0 0 @inputBorderRadius); + } + .add-on:last-child, + .btn:last-child { + margin-left: -1px; + .border-radius(0 @inputBorderRadius @inputBorderRadius 0); + } +} + + + +// SEARCH FORM +// ----------- + +input.search-query { + padding-right: 14px; + padding-right: 4px \9; + padding-left: 14px; + padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */ + margin-bottom: 0; // Remove the default margin on all inputs + .border-radius(15px); +} + +/* Allow for input prepend/append in search forms */ +.form-search .input-append .search-query, +.form-search .input-prepend .search-query { + .border-radius(0); // Override due to specificity +} +.form-search .input-append .search-query { + .border-radius(14px 0 0 14px); +} +.form-search .input-append .btn { + .border-radius(0 14px 14px 0); +} +.form-search .input-prepend .search-query { + .border-radius(0 14px 14px 0); +} +.form-search .input-prepend .btn { + .border-radius(14px 0 0 14px); +} + + + + +// HORIZONTAL & VERTICAL FORMS +// --------------------------- + +// Common properties +// ----------------- + +.form-search, +.form-inline, +.form-horizontal { + input, + textarea, + select, + .help-inline, + .uneditable-input, + .input-prepend, + .input-append { + display: inline-block; + .ie7-inline-block(); + margin-bottom: 0; + vertical-align: middle; + } + // Re-hide hidden elements due to specifity + .hide { + display: none; + } +} +.form-search label, +.form-inline label, +.form-search .btn-group, +.form-inline .btn-group { + display: inline-block; +} +// Remove margin for input-prepend/-append +.form-search .input-append, +.form-inline .input-append, +.form-search .input-prepend, +.form-inline .input-prepend { + margin-bottom: 0; +} +// Inline checkbox/radio labels (remove padding on left) +.form-search .radio, +.form-search .checkbox, +.form-inline .radio, +.form-inline .checkbox { + padding-left: 0; + margin-bottom: 0; + vertical-align: middle; +} +// Remove float and margin, set to inline-block +.form-search .radio input[type="radio"], +.form-search .checkbox input[type="checkbox"], +.form-inline .radio input[type="radio"], +.form-inline .checkbox input[type="checkbox"] { + float: left; + margin-right: 3px; + margin-left: 0; +} + + +// Margin to space out fieldsets +.control-group { + margin-bottom: @baseLineHeight / 2; +} + +// Legend collapses margin, so next element is responsible for spacing +legend + .control-group { + margin-top: @baseLineHeight; + -webkit-margin-top-collapse: separate; +} + +// Horizontal-specific styles +// -------------------------- + +.form-horizontal { + // Increase spacing between groups + .control-group { + margin-bottom: @baseLineHeight; + .clearfix(); + } + // Float the labels left + .control-label { + float: left; + width: @horizontalComponentOffset - 20; + padding-top: 5px; + text-align: right; + } + // Move over all input controls and content + .controls { + // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend + // don't inherit the margin of the parent, in this case .controls + *display: inline-block; + *padding-left: 20px; + margin-left: @horizontalComponentOffset; + *margin-left: 0; + &:first-child { + *padding-left: @horizontalComponentOffset; + } + } + // Remove bottom margin on block level help text since that's accounted for on .control-group + .help-block { + margin-bottom: 0; + } + // And apply it only to .help-block instances that follow a form control + input, + select, + textarea { + + .help-block { + margin-top: @baseLineHeight / 2; + } + } + // Move over buttons in .form-actions to align with .controls + .form-actions { + padding-left: @horizontalComponentOffset; + } +} +// +// Tables +// -------------------------------------------------- + + +// BASE TABLES +// ----------------- + +table { + max-width: 100%; + background-color: @tableBackground; + border-collapse: collapse; + border-spacing: 0; +} + +// BASELINE STYLES +// --------------- + +.table { + width: 100%; + margin-bottom: @baseLineHeight; + // Cells + th, + td { + padding: 8px; + line-height: @baseLineHeight; + text-align: left; + vertical-align: top; + border-top: 1px solid @tableBorder; + } + th { + font-weight: bold; + } + // Bottom align for column headings + thead th { + vertical-align: bottom; + } + // Remove top border from thead by default + caption + thead tr:first-child th, + caption + thead tr:first-child td, + colgroup + thead tr:first-child th, + colgroup + thead tr:first-child td, + thead:first-child tr:first-child th, + thead:first-child tr:first-child td { + border-top: 0; + } + // Account for multiple tbody instances + tbody + tbody { + border-top: 2px solid @tableBorder; + } +} + + + +// CONDENSED TABLE W/ HALF PADDING +// ------------------------------- + +.table-condensed { + th, + td { + padding: 4px 5px; + } +} + + +// BORDERED VERSION +// ---------------- + +.table-bordered { + border: 1px solid @tableBorder; + border-collapse: separate; // Done so we can round those corners! + *border-collapse: collapse; // IE7 can't round corners anyway + border-left: 0; + .border-radius(4px); + th, + td { + border-left: 1px solid @tableBorder; + } + // Prevent a double border + caption + thead tr:first-child th, + caption + tbody tr:first-child th, + caption + tbody tr:first-child td, + colgroup + thead tr:first-child th, + colgroup + tbody tr:first-child th, + colgroup + tbody tr:first-child td, + thead:first-child tr:first-child th, + tbody:first-child tr:first-child th, + tbody:first-child tr:first-child td { + border-top: 0; + } + // For first th or td in the first row in the first thead or tbody + thead:first-child tr:first-child th:first-child, + tbody:first-child tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + } + thead:first-child tr:first-child th:last-child, + tbody:first-child tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + } + // For first th or td in the first row in the first thead or tbody + thead:last-child tr:last-child th:first-child, + tbody:last-child tr:last-child td:first-child, + tfoot:last-child tr:last-child td:first-child { + .border-radius(0 0 0 4px); + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + } + thead:last-child tr:last-child th:last-child, + tbody:last-child tr:last-child td:last-child, + tfoot:last-child tr:last-child td:last-child { + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + } + + // Special fixes to round the left border on the first td/th + caption + thead tr:first-child th:first-child, + caption + tbody tr:first-child td:first-child, + colgroup + thead tr:first-child th:first-child, + colgroup + tbody tr:first-child td:first-child { + -webkit-border-top-left-radius: 4px; + border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + } + caption + thead tr:first-child th:last-child, + caption + tbody tr:first-child td:last-child, + colgroup + thead tr:first-child th:last-child, + colgroup + tbody tr:first-child td:last-child { + -webkit-border-top-right-radius: 4px; + border-top-right-radius: 4px; + -moz-border-radius-topleft: 4px; + } + +} + + + + +// ZEBRA-STRIPING +// -------------- + +// Default zebra-stripe styles (alternating gray and transparent backgrounds) +.table-striped { + tbody { + tr:nth-child(odd) td, + tr:nth-child(odd) th { + background-color: @tableBackgroundAccent; + } + } +} + + +// HOVER EFFECT +// ------------ +// Placed here since it has to come after the potential zebra striping +.table-hover { + tbody { + tr:hover td, + tr:hover th { + background-color: @tableBackgroundHover; + } + } +} + + +// TABLE CELL SIZING +// ----------------- + +// Reset default grid behavior +table [class*=span], +.row-fluid table [class*=span] { + display: table-cell; + float: none; // undo default grid column styles + margin-left: 0; // undo default grid column styles +} + +// Change the column widths to account for td/th padding +.table { + .span1 { .tableColumns(1); } + .span2 { .tableColumns(2); } + .span3 { .tableColumns(3); } + .span4 { .tableColumns(4); } + .span5 { .tableColumns(5); } + .span6 { .tableColumns(6); } + .span7 { .tableColumns(7); } + .span8 { .tableColumns(8); } + .span9 { .tableColumns(9); } + .span10 { .tableColumns(10); } + .span11 { .tableColumns(11); } + .span12 { .tableColumns(12); } + .span13 { .tableColumns(13); } + .span14 { .tableColumns(14); } + .span15 { .tableColumns(15); } + .span16 { .tableColumns(16); } + .span17 { .tableColumns(17); } + .span18 { .tableColumns(18); } + .span19 { .tableColumns(19); } + .span20 { .tableColumns(20); } + .span21 { .tableColumns(21); } + .span22 { .tableColumns(22); } + .span23 { .tableColumns(23); } + .span24 { .tableColumns(24); } +} + + + +// TABLE BACKGROUNDS +// ----------------- +// Exact selectors below required to override .table-striped + +.table tbody tr { + &.success td { + background-color: @successBackground; + } + &.error td { + background-color: @errorBackground; + } + &.warning td { + background-color: @warningBackground; + } + &.info td { + background-color: @infoBackground; + } +} + +// Hover states for .table-hover +.table-hover tbody tr { + &.success:hover td { + background-color: darken(@successBackground, 5%); + } + &.error:hover td { + background-color: darken(@errorBackground, 5%); + } + &.warning:hover td { + background-color: darken(@warningBackground, 5%); + } + &.info:hover td { + background-color: darken(@infoBackground, 5%); + } +} + +// Components: common +// +// Sprites +// -------------------------------------------------- + + +// ICONS +// ----- + +// All icons receive the styles of the tag with a base class +// of .i and are then given a unique class to add width, height, +// and background-position. Your resulting HTML will look like +// . + +// For the white version of the icons, just add the .icon-white class: +// + +[class^="icon-"], +[class*=" icon-"] { + display: inline-block; + width: 14px; + height: 14px; + .ie7-restore-right-whitespace(); + line-height: 14px; + vertical-align: text-top; + background-image: url("@{iconSpritePath}"); + background-position: 14px 14px; + background-repeat: no-repeat; + margin-top: 1px; +} + +/* White icons with optional class, or on hover/active states of certain elements */ +.icon-white, +.nav-tabs > .active > a > [class^="icon-"], +.nav-tabs > .active > a > [class*=" icon-"], +.nav-pills > .active > a > [class^="icon-"], +.nav-pills > .active > a > [class*=" icon-"], +.nav-list > .active > a > [class^="icon-"], +.nav-list > .active > a > [class*=" icon-"], +.navbar-inverse .nav > .active > a > [class^="icon-"], +.navbar-inverse .nav > .active > a > [class*=" icon-"], +.dropdown-menu > li > a:hover > [class^="icon-"], +.dropdown-menu > li > a:hover > [class*=" icon-"], +.dropdown-menu > .active > a > [class^="icon-"], +.dropdown-menu > .active > a > [class*=" icon-"] { + background-image: url("@{iconWhiteSpritePath}"); +} + +.icon-glass { background-position: 0 0; } +.icon-music { background-position: -24px 0; } +.icon-search { background-position: -48px 0; } +.icon-envelope { background-position: -72px 0; } +.icon-heart { background-position: -96px 0; } +.icon-star { background-position: -120px 0; } +.icon-star-empty { background-position: -144px 0; } +.icon-user { background-position: -168px 0; } +.icon-film { background-position: -192px 0; } +.icon-th-large { background-position: -216px 0; } +.icon-th { background-position: -240px 0; } +.icon-th-list { background-position: -264px 0; } +.icon-ok { background-position: -288px 0; } +.icon-remove { background-position: -312px 0; } +.icon-zoom-in { background-position: -336px 0; } +.icon-zoom-out { background-position: -360px 0; } +.icon-off { background-position: -384px 0; } +.icon-signal { background-position: -408px 0; } +.icon-cog { background-position: -432px 0; } +.icon-trash { background-position: -456px 0; } + +.icon-home { background-position: 0 -24px; } +.icon-file { background-position: -24px -24px; } +.icon-time { background-position: -48px -24px; } +.icon-road { background-position: -72px -24px; } +.icon-download-alt { background-position: -96px -24px; } +.icon-download { background-position: -120px -24px; } +.icon-upload { background-position: -144px -24px; } +.icon-inbox { background-position: -168px -24px; } +.icon-play-circle { background-position: -192px -24px; } +.icon-repeat { background-position: -216px -24px; } +.icon-refresh { background-position: -240px -24px; } +.icon-list-alt { background-position: -264px -24px; } +.icon-lock { background-position: -287px -24px; } // 1px off +.icon-flag { background-position: -312px -24px; } +.icon-headphones { background-position: -336px -24px; } +.icon-volume-off { background-position: -360px -24px; } +.icon-volume-down { background-position: -384px -24px; } +.icon-volume-up { background-position: -408px -24px; } +.icon-qrcode { background-position: -432px -24px; } +.icon-barcode { background-position: -456px -24px; } + +.icon-tag { background-position: 0 -48px; } +.icon-tags { background-position: -25px -48px; } // 1px off +.icon-book { background-position: -48px -48px; } +.icon-bookmark { background-position: -72px -48px; } +.icon-print { background-position: -96px -48px; } +.icon-camera { background-position: -120px -48px; } +.icon-font { background-position: -144px -48px; } +.icon-bold { background-position: -167px -48px; } // 1px off +.icon-italic { background-position: -192px -48px; } +.icon-text-height { background-position: -216px -48px; } +.icon-text-width { background-position: -240px -48px; } +.icon-align-left { background-position: -264px -48px; } +.icon-align-center { background-position: -288px -48px; } +.icon-align-right { background-position: -312px -48px; } +.icon-align-justify { background-position: -336px -48px; } +.icon-list { background-position: -360px -48px; } +.icon-indent-left { background-position: -384px -48px; } +.icon-indent-right { background-position: -408px -48px; } +.icon-facetime-video { background-position: -432px -48px; } +.icon-picture { background-position: -456px -48px; } + +.icon-pencil { background-position: 0 -72px; } +.icon-map-marker { background-position: -24px -72px; } +.icon-adjust { background-position: -48px -72px; } +.icon-tint { background-position: -72px -72px; } +.icon-edit { background-position: -96px -72px; } +.icon-share { background-position: -120px -72px; } +.icon-check { background-position: -144px -72px; } +.icon-move { background-position: -168px -72px; } +.icon-step-backward { background-position: -192px -72px; } +.icon-fast-backward { background-position: -216px -72px; } +.icon-backward { background-position: -240px -72px; } +.icon-play { background-position: -264px -72px; } +.icon-pause { background-position: -288px -72px; } +.icon-stop { background-position: -312px -72px; } +.icon-forward { background-position: -336px -72px; } +.icon-fast-forward { background-position: -360px -72px; } +.icon-step-forward { background-position: -384px -72px; } +.icon-eject { background-position: -408px -72px; } +.icon-chevron-left { background-position: -432px -72px; } +.icon-chevron-right { background-position: -456px -72px; } + +.icon-plus-sign { background-position: 0 -96px; } +.icon-minus-sign { background-position: -24px -96px; } +.icon-remove-sign { background-position: -48px -96px; } +.icon-ok-sign { background-position: -72px -96px; } +.icon-question-sign { background-position: -96px -96px; } +.icon-info-sign { background-position: -120px -96px; } +.icon-screenshot { background-position: -144px -96px; } +.icon-remove-circle { background-position: -168px -96px; } +.icon-ok-circle { background-position: -192px -96px; } +.icon-ban-circle { background-position: -216px -96px; } +.icon-arrow-left { background-position: -240px -96px; } +.icon-arrow-right { background-position: -264px -96px; } +.icon-arrow-up { background-position: -289px -96px; } // 1px off +.icon-arrow-down { background-position: -312px -96px; } +.icon-share-alt { background-position: -336px -96px; } +.icon-resize-full { background-position: -360px -96px; } +.icon-resize-small { background-position: -384px -96px; } +.icon-plus { background-position: -408px -96px; } +.icon-minus { background-position: -433px -96px; } +.icon-asterisk { background-position: -456px -96px; } + +.icon-exclamation-sign { background-position: 0 -120px; } +.icon-gift { background-position: -24px -120px; } +.icon-leaf { background-position: -48px -120px; } +.icon-fire { background-position: -72px -120px; } +.icon-eye-open { background-position: -96px -120px; } +.icon-eye-close { background-position: -120px -120px; } +.icon-warning-sign { background-position: -144px -120px; } +.icon-plane { background-position: -168px -120px; } +.icon-calendar { background-position: -192px -120px; } +.icon-random { background-position: -216px -120px; width: 16px; } +.icon-comment { background-position: -240px -120px; } +.icon-magnet { background-position: -264px -120px; } +.icon-chevron-up { background-position: -288px -120px; } +.icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off +.icon-retweet { background-position: -336px -120px; } +.icon-shopping-cart { background-position: -360px -120px; } +.icon-folder-close { background-position: -384px -120px; } +.icon-folder-open { background-position: -408px -120px; width: 16px; } +.icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off +.icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off + +.icon-hdd { background-position: 0 -144px; } +.icon-bullhorn { background-position: -24px -144px; } +.icon-bell { background-position: -48px -144px; } +.icon-certificate { background-position: -72px -144px; } +.icon-thumbs-up { background-position: -96px -144px; } +.icon-thumbs-down { background-position: -120px -144px; } +.icon-hand-right { background-position: -144px -144px; } +.icon-hand-left { background-position: -168px -144px; } +.icon-hand-up { background-position: -192px -144px; } +.icon-hand-down { background-position: -216px -144px; } +.icon-circle-arrow-right { background-position: -240px -144px; } +.icon-circle-arrow-left { background-position: -264px -144px; } +.icon-circle-arrow-up { background-position: -288px -144px; } +.icon-circle-arrow-down { background-position: -312px -144px; } +.icon-globe { background-position: -336px -144px; } +.icon-wrench { background-position: -360px -144px; } +.icon-tasks { background-position: -384px -144px; } +.icon-filter { background-position: -408px -144px; } +.icon-briefcase { background-position: -432px -144px; } +.icon-fullscreen { background-position: -456px -144px; } +// +// Dropdown menus +// -------------------------------------------------- + + +// Use the .menu class on any
    • element within the topbar or ul.tabs and you'll get some superfancy dropdowns +.dropup, +.dropdown { + position: relative; +} +.dropdown-toggle { + // The caret makes the toggle a bit too tall in IE7 + *margin-bottom: -3px; +} +.dropdown-toggle:active, +.open .dropdown-toggle { + outline: 0; +} + +// Dropdown arrow/caret +// -------------------- +.caret { + display: inline-block; + width: 0; + height: 0; + vertical-align: top; + border-top: 4px solid @black; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + content: ""; +} + +// Place the caret +.dropdown .caret { + margin-top: 8px; + margin-left: 2px; +} + +// The dropdown menu (ul) +// ---------------------- +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: @zindexDropdown; + display: none; // none by default, but block on "open" of the menu + float: left; + min-width: 160px; + padding: 5px 0; + margin: 2px 0 0; // override default ul + list-style: none; + background-color: @dropdownBackground; + border: 1px solid #ccc; // Fallback for IE7-8 + border: 1px solid @dropdownBorder; + *border-right-width: 2px; + *border-bottom-width: 2px; + .border-radius(6px); + .box-shadow(0 5px 10px rgba(0,0,0,.2)); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + + // Aligns the dropdown menu to right + &.pull-right { + right: 0; + left: auto; + } + + // Dividers (basically an hr) within the dropdown + .divider { + .nav-divider(@dropdownDividerTop, @dropdownDividerBottom); + } + + // Links within the dropdown menu + a { + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: @baseLineHeight; + color: @dropdownLinkColor; + white-space: nowrap; + } +} + +// Hover state +// ----------- +.dropdown-menu li > a:hover, +.dropdown-menu li > a:focus, +.dropdown-submenu:hover > a { + text-decoration: none; + color: @dropdownLinkColorHover; + background-color: @dropdownLinkBackgroundHover; + #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%)); +} + +// Active state +// ------------ +.dropdown-menu .active > a, +.dropdown-menu .active > a:hover { + color: @dropdownLinkColorHover; + text-decoration: none; + outline: 0; + background-color: @dropdownLinkBackgroundActive; + #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%)); +} + +// Disabled state +// -------------- +// Gray out text and ensure the hover state remains gray +.dropdown-menu .disabled > a, +.dropdown-menu .disabled > a:hover { + color: @grayLight; +} +// Nuke hover effects +.dropdown-menu .disabled > a:hover { + text-decoration: none; + background-color: transparent; + cursor: default; +} + +// Open state for the dropdown +// --------------------------- +.open { + // IE7's z-index only goes to the nearest positioned ancestor, which would + // make the menu appear below buttons that appeared later on the page + *z-index: @zindexDropdown; + + & > .dropdown-menu { + display: block; + } +} + +// Right aligned dropdowns +// --------------------------- +.pull-right > .dropdown-menu { + right: 0; + left: auto; +} + +// Allow for dropdowns to go bottom up (aka, dropup-menu) +// ------------------------------------------------------ +// Just add .dropup after the standard .dropdown class and you're set, bro. +// TODO: abstract this so that the navbar fixed styles are not placed here? +.dropup, +.navbar-fixed-bottom .dropdown { + // Reverse the caret + .caret { + border-top: 0; + border-bottom: 4px solid @black; + content: ""; + } + // Different positioning for bottom up menu + .dropdown-menu { + top: auto; + bottom: 100%; + margin-bottom: 1px; + } +} + +// Sub menus +// --------------------------- +.dropdown-submenu { + position: relative; +} +.dropdown-submenu > .dropdown-menu { + top: 0; + left: 100%; + margin-top: -6px; + margin-left: -1px; + -webkit-border-radius: 0 6px 6px 6px; + -moz-border-radius: 0 6px 6px 6px; + border-radius: 0 6px 6px 6px; +} +.dropdown-submenu:hover > .dropdown-menu { + display: block; +} + +.dropdown-submenu > a:after { + display: block; + content: " "; + float: right; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; + border-width: 5px 0 5px 5px; + border-left-color: darken(@dropdownBackground, 20%); + margin-top: 5px; + margin-right: -10px; +} +.dropdown-submenu:hover > a:after { + border-left-color: @dropdownLinkColorHover; +} + + +// Tweak nav headers +// ----------------- +// Increase padding from 15px to 20px on sides +.dropdown .dropdown-menu .nav-header { + padding-left: 20px; + padding-right: 20px; +} + +// Typeahead +// --------- +.typeahead { + margin-top: 2px; // give it some space to breathe + .border-radius(4px); +} +// +// Wells +// -------------------------------------------------- + + +// Base class +.well { + min-height: 20px; + padding: 19px; + margin-bottom: 20px; + background-color: @wellBackground; + border: 1px solid darken(@wellBackground, 7%); + .border-radius(4px); + .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); + blockquote { + border-color: #ddd; + border-color: rgba(0,0,0,.15); + } +} + +// Sizes +.well-large { + padding: 24px; + .border-radius(6px); +} +.well-small { + padding: 9px; + .border-radius(3px); +} +// +// Component animations +// -------------------------------------------------- + + +.fade { + opacity: 0; + .transition(opacity .15s linear); + &.in { + opacity: 1; + } +} + +.collapse { + position: relative; + height: 0; + overflow: hidden; + .transition(height .35s ease); + &.in { + height: auto; + } +} +// +// Close icons +// -------------------------------------------------- + + +.close { + float: right; + font-size: 20px; + font-weight: bold; + line-height: @baseLineHeight; + color: @black; + text-shadow: 0 1px 0 rgba(255,255,255,1); + .opacity(20); + &:hover { + color: @black; + text-decoration: none; + cursor: pointer; + .opacity(40); + } +} + +// Additional properties for button version +// iOS requires the button element instead of an anchor tag. +// If you want the anchor version, it requires `href="#"`. +button.close { + padding: 0; + cursor: pointer; + background: transparent; + border: 0; + -webkit-appearance: none; +} +// Components: Buttons & Alerts +// +// Buttons +// -------------------------------------------------- + + +// Base styles +// -------------------------------------------------- + +// Core +.btn { + display: inline-block; + .ie7-inline-block(); + padding: 4px 14px; + margin-bottom: 0; // For input.btn + font-size: @baseFontSize; + line-height: @baseLineHeight; + *line-height: @baseLineHeight; + text-align: center; + vertical-align: middle; + cursor: pointer; + .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); + border: 1px solid @btnBorder; + *border: 0; // Remove the border to prevent IE7's black border on input:focus + border-bottom-color: darken(@btnBorder, 10%); + .border-radius(4px); + .ie7-restore-left-whitespace(); // Give IE7 some love + .box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); + + // Hover state + &:hover { + color: @grayDark; + text-decoration: none; + background-color: darken(@white, 10%); + *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */ + background-position: 0 -15px; + + // transition is only when going to hover, otherwise the background + // behind the gradient (there for IE<=9 fallback) gets mismatched + .transition(background-position .1s linear); + } + + // Focus state for keyboard and accessibility + &:focus { + .tab-focus(); + } + + // Active state + &.active, + &:active { + background-color: darken(@white, 10%); + background-color: darken(@white, 15%) e("\9"); + background-image: none; + outline: 0; + .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); + } + + // Disabled state + &.disabled, + &[disabled] { + cursor: default; + background-color: darken(@white, 10%); + background-image: none; + .opacity(65); + .box-shadow(none); + } + +} + + + +// Button Sizes +// -------------------------------------------------- + +// Large +.btn-large { + padding: 9px 14px; + font-size: @baseFontSize + 2px; + line-height: normal; + .border-radius(5px); +} +.btn-large [class^="icon-"] { + margin-top: 2px; +} + +// Small +.btn-small { + padding: 3px 9px; + font-size: @baseFontSize - 2px; + line-height: @baseLineHeight - 2px; +} +.btn-small [class^="icon-"] { + margin-top: 0; +} + +// Mini +.btn-mini { + padding: 2px 6px; + font-size: @baseFontSize - 3px; + line-height: @baseLineHeight - 3px; +} + + +// Block button +// ------------------------- + +.btn-block { + display: block; + width: 100%; + padding-left: 0; + padding-right: 0; + .box-sizing(border-box); +} + +// Vertically space out multiple block buttons +.btn-block + .btn-block { + margin-top: 5px; +} + +// Specificity overrides +input[type="submit"], +input[type="reset"], +input[type="button"] { + &.btn-block { + width: 100%; + } +} + + + +// Alternate buttons +// -------------------------------------------------- + +// Provide *some* extra contrast for those who can get it +.btn-primary.active, +.btn-warning.active, +.btn-danger.active, +.btn-success.active, +.btn-info.active, +.btn-inverse.active { + color: rgba(255,255,255,.75); +} + +// Set the backgrounds +// ------------------------- +.btn { + // reset here as of 2.0.3 due to Recess property order + border-color: #c5c5c5; + border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25); +} +.btn-primary { + .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); +} +// Warning appears are orange +.btn-warning { + .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight); +} +// Danger and error appear as red +.btn-danger { + .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight); +} +// Success appears as green +.btn-success { + .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight); +} +// Info appears as a neutral blue +.btn-info { + .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight); +} +// Inverse appears as dark gray +.btn-inverse { + .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight); +} + + +// Cross-browser Jank +// -------------------------------------------------- + +button.btn, +input[type="submit"].btn { + + // Firefox 3.6 only I believe + &::-moz-focus-inner { + padding: 0; + border: 0; + } + + // IE7 has some default padding on button controls + *padding-top: 3px; + *padding-bottom: 3px; + + &.btn-large { + *padding-top: 7px; + *padding-bottom: 7px; + } + &.btn-small { + *padding-top: 3px; + *padding-bottom: 3px; + } + &.btn-mini { + *padding-top: 1px; + *padding-bottom: 1px; + } +} + + +// Link buttons +// -------------------------------------------------- + +// Make a button look and behave like a link +.btn-link, +.btn-link:active, +.btn-link[disabled] { + background-color: transparent; + background-image: none; + .box-shadow(none); +} +.btn-link { + border-color: transparent; + cursor: pointer; + color: @linkColor; + .border-radius(0); +} +.btn-link:hover { + color: @linkColorHover; + text-decoration: underline; + background-color: transparent; +} +.btn-link[disabled]:hover { + color: @grayDark; + text-decoration: none; +} +// +// Button groups +// -------------------------------------------------- + + +// Make the div behave like a button +.btn-group { + position: relative; + font-size: 0; // remove as part 1 of font-size inline-block hack + vertical-align: middle; // match .btn alignment given font-size hack above + white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page) + .ie7-restore-left-whitespace(); +} + +// Space out series of button groups +.btn-group + .btn-group { + margin-left: 5px; +} + +// Optional: Group multiple button groups together for a toolbar +.btn-toolbar { + font-size: 0; // Hack to remove whitespace that results from using inline-block + margin-top: @baseLineHeight / 2; + margin-bottom: @baseLineHeight / 2; + .btn-group { + display: inline-block; + .ie7-inline-block(); + } + .btn + .btn, + .btn-group + .btn, + .btn + .btn-group { + margin-left: 5px; + } +} + +// Float them, remove border radius, then re-add to first and last elements +.btn-group > .btn { + position: relative; + .border-radius(0); +} +.btn-group > .btn + .btn { + margin-left: -1px; +} +.btn-group > .btn, +.btn-group > .dropdown-menu { + font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack +} + +// Reset fonts for other sizes +.btn-group > .btn-mini { + font-size: 11px; +} +.btn-group > .btn-small { + font-size: 12px; +} +.btn-group > .btn-large { + font-size: 16px; +} + +// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match +.btn-group > .btn:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; +} +// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it +.btn-group > .btn:last-child, +.btn-group > .dropdown-toggle { + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; +} +// Reset corners for large buttons +.btn-group > .btn.large:first-child { + margin-left: 0; + -webkit-border-top-left-radius: 6px; + -moz-border-radius-topleft: 6px; + border-top-left-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -moz-border-radius-bottomleft: 6px; + border-bottom-left-radius: 6px; +} +.btn-group > .btn.large:last-child, +.btn-group > .large.dropdown-toggle { + -webkit-border-top-right-radius: 6px; + -moz-border-radius-topright: 6px; + border-top-right-radius: 6px; + -webkit-border-bottom-right-radius: 6px; + -moz-border-radius-bottomright: 6px; + border-bottom-right-radius: 6px; +} + +// On hover/focus/active, bring the proper btn to front +.btn-group > .btn:hover, +.btn-group > .btn:focus, +.btn-group > .btn:active, +.btn-group > .btn.active { + z-index: 2; +} + +// On active and open, don't show outline +.btn-group .dropdown-toggle:active, +.btn-group.open .dropdown-toggle { + outline: 0; +} + + + +// Split button dropdowns +// ---------------------- + +// Give the line between buttons some depth +.btn-group > .btn + .dropdown-toggle { + padding-left: 8px; + padding-right: 8px; + .box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)); + *padding-top: 5px; + *padding-bottom: 5px; +} +.btn-group > .btn-mini + .dropdown-toggle { + padding-left: 5px; + padding-right: 5px; + *padding-top: 2px; + *padding-bottom: 2px; +} +.btn-group > .btn-small + .dropdown-toggle { + *padding-top: 5px; + *padding-bottom: 4px; +} +.btn-group > .btn-large + .dropdown-toggle { + padding-left: 12px; + padding-right: 12px; + *padding-top: 7px; + *padding-bottom: 7px; +} + +.btn-group.open { + + // The clickable button for toggling the menu + // Remove the gradient and set the same inset shadow as the :active state + .dropdown-toggle { + background-image: none; + .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)); + } + + // Keep the hover's background when dropdown is open + .btn.dropdown-toggle { + background-color: @btnBackgroundHighlight; + } + .btn-primary.dropdown-toggle { + background-color: @btnPrimaryBackgroundHighlight; + } + .btn-warning.dropdown-toggle { + background-color: @btnWarningBackgroundHighlight; + } + .btn-danger.dropdown-toggle { + background-color: @btnDangerBackgroundHighlight; + } + .btn-success.dropdown-toggle { + background-color: @btnSuccessBackgroundHighlight; + } + .btn-info.dropdown-toggle { + background-color: @btnInfoBackgroundHighlight; + } + .btn-inverse.dropdown-toggle { + background-color: @btnInverseBackgroundHighlight; + } +} + + +// Reposition the caret +.btn .caret { + margin-top: 8px; + margin-left: 0; +} +// Carets in other button sizes +.btn-mini .caret, +.btn-small .caret, +.btn-large .caret { + margin-top: 6px; +} +.btn-large .caret { + border-left-width: 5px; + border-right-width: 5px; + border-top-width: 5px; +} +// Upside down carets for .dropup +.dropup .btn-large .caret { + border-bottom: 5px solid @black; + border-top: 0; +} + + + +// Account for other colors +.btn-primary, +.btn-warning, +.btn-danger, +.btn-info, +.btn-success, +.btn-inverse { + .caret { + border-top-color: @white; + border-bottom-color: @white; + } +} + + + +// Vertical button groups +// ---------------------- + +.btn-group-vertical { + display: inline-block; // makes buttons only take up the width they need + .ie7-inline-block(); +} +.btn-group-vertical .btn { + display: block; + float: none; + width: 100%; + .border-radius(0); +} +.btn-group-vertical .btn + .btn { + margin-left: 0; + margin-top: -1px; +} +.btn-group-vertical .btn:first-child { + .border-radius(4px 4px 0 0); +} +.btn-group-vertical .btn:last-child { + .border-radius(0 0 4px 4px); +} +.btn-group-vertical .btn-large:first-child { + .border-radius(6px 6px 0 0); +} +.btn-group-vertical .btn-large:last-child { + .border-radius(0 0 6px 6px); +} +// +// Alerts +// -------------------------------------------------- + + +// Base styles +// ------------------------- + +.alert { + padding: 8px 35px 8px 14px; + margin-bottom: @baseLineHeight; + text-shadow: 0 1px 0 rgba(255,255,255,.5); + background-color: @warningBackground; + border: 1px solid @warningBorder; + .border-radius(4px); + color: @warningText; +} +.alert h4 { + margin: 0; +} + +// Adjust close link position +.alert .close { + position: relative; + top: -2px; + right: -21px; + line-height: @baseLineHeight; +} + + +// Alternate styles +// ------------------------- + +.alert-success { + background-color: @successBackground; + border-color: @successBorder; + color: @successText; +} +.alert-danger, +.alert-error { + background-color: @errorBackground; + border-color: @errorBorder; + color: @errorText; +} +.alert-info { + background-color: @infoBackground; + border-color: @infoBorder; + color: @infoText; +} + + +// Block alerts +// ------------------------- + +.alert-block { + padding-top: 14px; + padding-bottom: 14px; +} +.alert-block > p, +.alert-block > ul { + margin-bottom: 0; +} +.alert-block p + p { + margin-top: 5px; +} + +// Components: Nav +// +// Navs +// -------------------------------------------------- + + +// BASE CLASS +// ---------- + +.nav { + margin-left: 0; + margin-bottom: @baseLineHeight; + list-style: none; +} + +// Make links block level +.nav > li > a { + display: block; +} +.nav > li > a:hover { + text-decoration: none; + background-color: @grayLighter; +} + +// Redeclare pull classes because of specifity +.nav > .pull-right { + float: right; +} + +// Nav headers (for dropdowns and lists) +.nav-header { + display: block; + padding: 3px 15px; + font-size: 11px; + font-weight: bold; + line-height: @baseLineHeight; + color: @grayLight; + text-shadow: 0 1px 0 rgba(255,255,255,.5); + text-transform: uppercase; +} +// Space them out when they follow another list item (link) +.nav li + .nav-header { + margin-top: 9px; +} + + + +// NAV LIST +// -------- + +.nav-list { + padding-left: 15px; + padding-right: 15px; + margin-bottom: 0; +} +.nav-list > li > a, +.nav-list .nav-header { + margin-left: -15px; + margin-right: -15px; + text-shadow: 0 1px 0 rgba(255,255,255,.5); +} +.nav-list > li > a { + padding: 3px 15px; +} +.nav-list > .active > a, +.nav-list > .active > a:hover { + color: @white; + text-shadow: 0 -1px 0 rgba(0,0,0,.2); + background-color: @linkColor; +} +.nav-list [class^="icon-"] { + margin-right: 2px; +} +// Dividers (basically an hr) within the dropdown +.nav-list .divider { + .nav-divider(); +} + + + +// TABS AND PILLS +// ------------- + +// Common styles +.nav-tabs, +.nav-pills { + .clearfix(); +} +.nav-tabs > li, +.nav-pills > li { + float: left; +} +.nav-tabs > li > a, +.nav-pills > li > a { + padding-right: 12px; + padding-left: 12px; + margin-right: 2px; + line-height: 14px; // keeps the overall height an even number +} + +// TABS +// ---- + +// Give the tabs something to sit on +.nav-tabs { + border-bottom: 1px solid #ddd; +} +// Make the list-items overlay the bottom border +.nav-tabs > li { + margin-bottom: -1px; +} +// Actual tabs (as links) +.nav-tabs > li > a { + padding-top: 8px; + padding-bottom: 8px; + line-height: @baseLineHeight; + border: 1px solid transparent; + .border-radius(4px 4px 0 0); + &:hover { + border-color: @grayLighter @grayLighter #ddd; + } +} +// Active state, and it's :hover to override normal :hover +.nav-tabs > .active > a, +.nav-tabs > .active > a:hover { + color: @gray; + background-color: @white; + border: 1px solid #ddd; + border-bottom-color: transparent; + cursor: default; +} + + +// PILLS +// ----- + +// Links rendered as pills +.nav-pills > li > a { + padding-top: 8px; + padding-bottom: 8px; + margin-top: 2px; + margin-bottom: 2px; + .border-radius(5px); +} + +// Active state +.nav-pills > .active > a, +.nav-pills > .active > a:hover { + color: @white; + background-color: @linkColor; +} + + + +// STACKED NAV +// ----------- + +// Stacked tabs and pills +.nav-stacked > li { + float: none; +} +.nav-stacked > li > a { + margin-right: 0; // no need for the gap between nav items +} + +// Tabs +.nav-tabs.nav-stacked { + border-bottom: 0; +} +.nav-tabs.nav-stacked > li > a { + border: 1px solid #ddd; + .border-radius(0); +} +.nav-tabs.nav-stacked > li:first-child > a { + .border-top-radius(4px); +} +.nav-tabs.nav-stacked > li:last-child > a { + .border-bottom-radius(4px); +} +.nav-tabs.nav-stacked > li > a:hover { + border-color: #ddd; + z-index: 2; +} + +// Pills +.nav-pills.nav-stacked > li > a { + margin-bottom: 3px; +} +.nav-pills.nav-stacked > li:last-child > a { + margin-bottom: 1px; // decrease margin to match sizing of stacked tabs +} + + + +// DROPDOWNS +// --------- + +.nav-tabs .dropdown-menu { + .border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu +} +.nav-pills .dropdown-menu { + .border-radius(6px); // make rounded corners match the pills +} + +// Default dropdown links +// ------------------------- +// Make carets use linkColor to start +.nav .dropdown-toggle .caret { + border-top-color: @linkColor; + border-bottom-color: @linkColor; + margin-top: 6px; +} +.nav .dropdown-toggle:hover .caret { + border-top-color: @linkColorHover; + border-bottom-color: @linkColorHover; +} +/* move down carets for tabs */ +.nav-tabs .dropdown-toggle .caret { + margin-top: 8px; +} + +// Active dropdown links +// ------------------------- +.nav .active .dropdown-toggle .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.nav-tabs .active .dropdown-toggle .caret { + border-top-color: @gray; + border-bottom-color: @gray; +} + +// Active:hover dropdown links +// ------------------------- +.nav > .dropdown.active > a:hover { + cursor: pointer; +} + +// Open dropdowns +// ------------------------- +.nav-tabs .open .dropdown-toggle, +.nav-pills .open .dropdown-toggle, +.nav > li.dropdown.open.active > a:hover { + color: @white; + background-color: @grayLight; + border-color: @grayLight; +} +.nav li.dropdown.open .caret, +.nav li.dropdown.open.active .caret, +.nav li.dropdown.open a:hover .caret { + border-top-color: @white; + border-bottom-color: @white; + .opacity(100); +} + +// Dropdowns in stacked tabs +.tabs-stacked .open > a:hover { + border-color: @grayLight; +} + + + +// TABBABLE +// -------- + + +// COMMON STYLES +// ------------- + +// Clear any floats +.tabbable { + .clearfix(); +} +.tab-content { + overflow: auto; // prevent content from running below tabs +} + +// Remove border on bottom, left, right +.tabs-below > .nav-tabs, +.tabs-right > .nav-tabs, +.tabs-left > .nav-tabs { + border-bottom: 0; +} + +// Show/hide tabbable areas +.tab-content > .tab-pane, +.pill-content > .pill-pane { + display: none; +} +.tab-content > .active, +.pill-content > .active { + display: block; +} + + +// BOTTOM +// ------ + +.tabs-below > .nav-tabs { + border-top: 1px solid #ddd; +} +.tabs-below > .nav-tabs > li { + margin-top: -1px; + margin-bottom: 0; +} +.tabs-below > .nav-tabs > li > a { + .border-radius(0 0 4px 4px); + &:hover { + border-bottom-color: transparent; + border-top-color: #ddd; + } +} +.tabs-below > .nav-tabs > .active > a, +.tabs-below > .nav-tabs > .active > a:hover { + border-color: transparent #ddd #ddd #ddd; +} + +// LEFT & RIGHT +// ------------ + +// Common styles +.tabs-left > .nav-tabs > li, +.tabs-right > .nav-tabs > li { + float: none; +} +.tabs-left > .nav-tabs > li > a, +.tabs-right > .nav-tabs > li > a { + min-width: 74px; + margin-right: 0; + margin-bottom: 3px; +} + +// Tabs on the left +.tabs-left > .nav-tabs { + float: left; + margin-right: 19px; + border-right: 1px solid #ddd; +} +.tabs-left > .nav-tabs > li > a { + margin-right: -1px; + .border-radius(4px 0 0 4px); +} +.tabs-left > .nav-tabs > li > a:hover { + border-color: @grayLighter #ddd @grayLighter @grayLighter; +} +.tabs-left > .nav-tabs .active > a, +.tabs-left > .nav-tabs .active > a:hover { + border-color: #ddd transparent #ddd #ddd; + *border-right-color: @white; +} + +// Tabs on the right +.tabs-right > .nav-tabs { + float: right; + margin-left: 19px; + border-left: 1px solid #ddd; +} +.tabs-right > .nav-tabs > li > a { + margin-left: -1px; + .border-radius(0 4px 4px 0); +} +.tabs-right > .nav-tabs > li > a:hover { + border-color: @grayLighter @grayLighter @grayLighter #ddd; +} +.tabs-right > .nav-tabs .active > a, +.tabs-right > .nav-tabs .active > a:hover { + border-color: #ddd #ddd #ddd transparent; + *border-left-color: @white; +} + + + +// DISABLED STATES +// --------------- + +// Gray out text +.nav > .disabled > a { + color: @grayLight; +} +// Nuke hover effects +.nav > .disabled > a:hover { + text-decoration: none; + background-color: transparent; + cursor: default; +} +// +// Navbars (Redux) +// -------------------------------------------------- + + +// COMMON STYLES +// ------------- + +// Base class and wrapper +.navbar { + overflow: visible; + margin-bottom: @baseLineHeight; + color: @navbarText; + + // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar + *position: relative; + *z-index: 2; +} + +// Inner for background effects +// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present +.navbar-inner { + min-height: @navbarHeight; + padding-left: 20px; + padding-right: 20px; + #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground); + border: 1px solid @navbarBorder; + .border-radius(4px); + .box-shadow(0 1px 4px rgba(0,0,0,.065)); + + // Prevent floats from breaking the navbar + .clearfix(); +} + +// Set width to auto for default container +// We then reset it for fixed navbars in the #gridSystem mixin +.navbar .container { + width: auto; +} + +// Override the default collapsed state +.nav-collapse.collapse { + height: auto; +} + + +// Brand: website or project name +// ------------------------- +.navbar .brand { + float: left; + display: block; + // Vertically center the text given @navbarHeight + padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2); + margin-left: -20px; // negative indent to left-align the text down the page + font-size: 20px; + font-weight: 200; + color: @navbarBrandColor; + text-shadow: 0 1px 0 @navbarBackgroundHighlight; + &:hover { + text-decoration: none; + } +} + +// Plain text in topbar +// ------------------------- +.navbar-text { + margin-bottom: 0; + line-height: @navbarHeight; +} + +// Janky solution for now to account for links outside the .nav +// ------------------------- +.navbar-link { + color: @navbarLinkColor; + &:hover { + color: @navbarLinkColorHover; + } +} + +// Dividers in navbar +// ------------------------- +.navbar .divider-vertical { + height: @navbarHeight; + margin: 0 9px; + border-left: 1px solid @navbarBackground; + border-right: 1px solid @navbarBackgroundHighlight; +} + +// Buttons in navbar +// ------------------------- +.navbar .btn, +.navbar .btn-group { + .navbarVerticalAlign(30px); // Vertically center in navbar +} +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn { + margin-top: 0; // then undo the margin here so we don't accidentally double it +} + +// Navbar forms +// ------------------------- +.navbar-form { + margin-bottom: 0; // remove default bottom margin + .clearfix(); + input, + select, + .radio, + .checkbox { + .navbarVerticalAlign(30px); // Vertically center in navbar + } + input, + select, + .btn { + display: inline-block; + margin-bottom: 0; + } + input[type="image"], + input[type="checkbox"], + input[type="radio"] { + margin-top: 3px; + } + .input-append, + .input-prepend { + margin-top: 6px; + white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left + input { + margin-top: 0; // remove the margin on top since it's on the parent + } + } +} + +// Navbar search +// ------------------------- +.navbar-search { + position: relative; + float: left; + .navbarVerticalAlign(30px); // Vertically center in navbar + margin-bottom: 0; + .search-query { + margin-bottom: 0; + padding: 4px 14px; + #font > .sans-serif(13px, normal, 1); + .border-radius(15px); // redeclare because of specificity of the type attribute + } +} + + + +// Static navbar +// ------------------------- + +.navbar-static-top { + position: static; + width: 100%; + margin-bottom: 0; // remove 18px margin for default navbar + .navbar-inner { + .border-radius(0); + } +} + + + +// Fixed navbar +// ------------------------- + +// Shared (top/bottom) styles +.navbar-fixed-top, +.navbar-fixed-bottom { + position: fixed; + right: 0; + left: 0; + z-index: @zindexFixedNavbar; + margin-bottom: 0; // remove 18px margin for default navbar +} +.navbar-fixed-top .navbar-inner, +.navbar-static-top .navbar-inner { + border-width: 0 0 1px; +} +.navbar-fixed-bottom .navbar-inner { + border-width: 1px 0 0; +} +.navbar-fixed-top .navbar-inner, +.navbar-fixed-bottom .navbar-inner { + padding-left: 0; + padding-right: 0; + .border-radius(0); +} + +// Reset container width +// Required here as we reset the width earlier on and the grid mixins don't override early enough +.navbar-static-top .container, +.navbar-fixed-top .container, +.navbar-fixed-bottom .container { + #grid > .core > .span(@gridColumns); +} + +// Fixed to top +.navbar-fixed-top { + top: 0; +} +.navbar-fixed-top, +.navbar-static-top { + .navbar-inner { + .box-shadow(inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)); + } +} + +// Fixed to bottom +.navbar-fixed-bottom { + bottom: 0; + .navbar-inner { + .box-shadow(inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)); + } +} + + + +// NAVIGATION +// ---------- + +.navbar .nav { + position: relative; + left: 0; + display: block; + float: left; + margin: 0 10px 0 0; +} +.navbar .nav.pull-right { + float: right; // redeclare due to specificity + margin-right: 0; // remove margin on float right nav +} +.navbar .nav > li { + float: left; +} + +// Links +.navbar .nav > li > a { + float: none; + // Vertically center the text given @navbarHeight + padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2); + color: @navbarLinkColor; + text-decoration: none; + text-shadow: 0 1px 0 @navbarBackgroundHighlight; +} +.navbar .nav .dropdown-toggle .caret { + margin-top: 8px; +} + +// Hover +.navbar .nav > li > a:focus, +.navbar .nav > li > a:hover { + background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active + color: @navbarLinkColorHover; + text-decoration: none; +} + +// Active nav items +.navbar .nav > .active > a, +.navbar .nav > .active > a:hover, +.navbar .nav > .active > a:focus { + color: @navbarLinkColorActive; + text-decoration: none; + background-color: @navbarLinkBackgroundActive; + .box-shadow(inset 0 3px 8px rgba(0,0,0,.125)); +} + +// Navbar button for toggling navbar items in responsive layouts +// These definitions need to come after '.navbar .btn' +.navbar .btn-navbar { + display: none; + float: right; + padding: 7px 10px; + margin-left: 5px; + margin-right: 5px; + .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%)); + .box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)); +} +.navbar .btn-navbar .icon-bar { + display: block; + width: 18px; + height: 2px; + background-color: #f5f5f5; + .border-radius(1px); + .box-shadow(0 1px 0 rgba(0,0,0,.25)); +} +.btn-navbar .icon-bar + .icon-bar { + margin-top: 3px; +} + + + +// Dropdown menus +// -------------- + +// Menu position and menu carets +.navbar .nav > li > .dropdown-menu { + &:before { + content: ''; + display: inline-block; + border-left: 7px solid transparent; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-bottom-color: @dropdownBorder; + position: absolute; + top: -7px; + left: 9px; + } + &:after { + content: ''; + display: inline-block; + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-bottom: 6px solid @dropdownBackground; + position: absolute; + top: -6px; + left: 10px; + } +} +// Menu position and menu caret support for dropups via extra dropup class +.navbar-fixed-bottom .nav > li > .dropdown-menu { + &:before { + border-top: 7px solid #ccc; + border-top-color: @dropdownBorder; + border-bottom: 0; + bottom: -7px; + top: auto; + } + &:after { + border-top: 6px solid @dropdownBackground; + border-bottom: 0; + bottom: -6px; + top: auto; + } +} + +// Remove background color from open dropdown +.navbar .nav li.dropdown.open > .dropdown-toggle, +.navbar .nav li.dropdown.active > .dropdown-toggle, +.navbar .nav li.dropdown.open.active > .dropdown-toggle { + background-color: @navbarLinkBackgroundActive; + color: @navbarLinkColorActive; +} +.navbar .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: @navbarLinkColor; + border-bottom-color: @navbarLinkColor; +} +.navbar .nav li.dropdown.open > .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: @navbarLinkColorActive; + border-bottom-color: @navbarLinkColorActive; +} + +// Right aligned menus need alt position +.navbar .pull-right > li > .dropdown-menu, +.navbar .nav > li > .dropdown-menu.pull-right { + left: auto; + right: 0; + &:before { + left: auto; + right: 12px; + } + &:after { + left: auto; + right: 13px; + } + .dropdown-menu { + left: auto; + right: 100%; + margin-left: 0; + margin-right: -1px; + .border-radius(6px 0 6px 6px); + } +} + + +// Inverted navbar +// ------------------------- + +.navbar-inverse { + color: @navbarInverseText; + + .navbar-inner { + #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground); + border-color: @navbarInverseBorder; + } + + .brand, + .nav > li > a { + color: @navbarInverseLinkColor; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + &:hover { + color: @navbarInverseLinkColorHover; + } + } + + .nav > li > a:focus, + .nav > li > a:hover { + background-color: @navbarInverseLinkBackgroundHover; + color: @navbarInverseLinkColorHover; + } + + .nav .active > a, + .nav .active > a:hover, + .nav .active > a:focus { + color: @navbarInverseLinkColorActive; + background-color: @navbarInverseLinkBackgroundActive; + } + + // Inline text links + .navbar-link { + color: @navbarInverseLinkColor; + &:hover { + color: @navbarInverseLinkColorHover; + } + } + + // Dividers in navbar + .divider-vertical { + border-left-color: @navbarInverseBackground; + border-right-color: @navbarInverseBackgroundHighlight; + } + + // Dropdowns + .nav li.dropdown.open > .dropdown-toggle, + .nav li.dropdown.active > .dropdown-toggle, + .nav li.dropdown.open.active > .dropdown-toggle { + background-color: @navbarInverseLinkBackgroundActive; + color: @navbarInverseLinkColorActive; + } + .nav li.dropdown > .dropdown-toggle .caret { + border-top-color: @navbarInverseLinkColor; + border-bottom-color: @navbarInverseLinkColor; + } + .nav li.dropdown.open > .dropdown-toggle .caret, + .nav li.dropdown.active > .dropdown-toggle .caret, + .nav li.dropdown.open.active > .dropdown-toggle .caret { + border-top-color: @navbarInverseLinkColorActive; + border-bottom-color: @navbarInverseLinkColorActive; + } + + // Navbar search + .navbar-search { + .search-query { + color: @white; + background-color: @navbarInverseSearchBackground; + border-color: @navbarInverseSearchBorder; + .box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)); + .transition(none); + .placeholder(@navbarInverseSearchPlaceholderColor); + + // Focus states (we use .focused since IE7-8 and down doesn't support :focus) + &:focus, + &.focused { + padding: 5px 15px; + color: @grayDark; + text-shadow: 0 1px 0 @white; + background-color: @navbarInverseSearchBackgroundFocus; + border: 0; + .box-shadow(0 0 3px rgba(0,0,0,.15)); + outline: 0; + } + } + } + + // Navbar collapse button + .btn-navbar { + .buttonBackground(darken(@navbarInverseBackgroundHighlight, 5%), darken(@navbarInverseBackground, 5%)); + } + +} + + + +// +// Breadcrumbs +// -------------------------------------------------- + + +.breadcrumb { + padding: 8px 15px; + margin: 0 0 @baseLineHeight; + list-style: none; + background-color: #f5f5f5; + .border-radius(4px); + li { + display: inline-block; + .ie7-inline-block(); + text-shadow: 0 1px 0 @white; + } + .divider { + padding: 0 5px; + color: #ccc; + } + .active { + color: @grayLight; + } +} +// +// Pagination (multiple pages) +// -------------------------------------------------- + + +.pagination { + height: @baseLineHeight * 2; + margin: @baseLineHeight 0; + } +.pagination ul { + display: inline-block; + .ie7-inline-block(); + margin-left: 0; + margin-bottom: 0; + .border-radius(3px); + .box-shadow(0 1px 2px rgba(0,0,0,.05)); +} +.pagination ul > li { + display: inline; +} +.pagination ul > li > a, +.pagination ul > li > span { + float: left; + padding: 0 14px; + line-height: (@baseLineHeight * 2) - 2; + text-decoration: none; + background-color: @paginationBackground; + border: 1px solid @paginationBorder; + border-left-width: 0; +} +.pagination ul > li > a:hover, +.pagination ul > .active > a, +.pagination ul > .active > span { + background-color: #f5f5f5; +} +.pagination ul > .active > a, +.pagination ul > .active > span { + color: @grayLight; + cursor: default; +} +.pagination ul > .disabled > span, +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover { + color: @grayLight; + background-color: transparent; + cursor: default; +} +.pagination ul > li:first-child > a, +.pagination ul > li:first-child > span { + border-left-width: 1px; + .border-radius(3px 0 0 3px); +} +.pagination ul > li:last-child > a, +.pagination ul > li:last-child > span { + .border-radius(0 3px 3px 0); +} + +// Centered +.pagination-centered { + text-align: center; +} +.pagination-right { + text-align: right; +} +// +// Pager pagination +// -------------------------------------------------- + + +.pager { + margin: @baseLineHeight 0; + list-style: none; + text-align: center; + .clearfix(); +} +.pager li { + display: inline; +} +.pager a, +.pager span { + display: inline-block; + padding: 5px 14px; + background-color: #fff; + border: 1px solid #ddd; + .border-radius(15px); +} +.pager a:hover { + text-decoration: none; + background-color: #f5f5f5; +} +.pager .next a, +.pager .next span { + float: right; +} +.pager .previous a { + float: left; +} +.pager .disabled a, +.pager .disabled a:hover, +.pager .disabled span { + color: @grayLight; + background-color: #fff; + cursor: default; +} +// Components: Popovers +// +// Modals +// -------------------------------------------------- + + +// Recalculate z-index where appropriate, +// but only apply to elements within modal +.modal-open .modal { + .dropdown-menu { z-index: @zindexDropdown + @zindexModal; } + .dropdown.open { *z-index: @zindexDropdown + @zindexModal; } + .popover { z-index: @zindexPopover + @zindexModal; } + .tooltip { z-index: @zindexTooltip + @zindexModal; } +} + +// Background +.modal-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: @zindexModalBackdrop; + background-color: @black; + // Fade for backdrop + &.fade { opacity: 0; } +} + +.modal-backdrop, +.modal-backdrop.fade.in { + .opacity(80); +} + +// Base modal +.modal { + position: fixed; + top: 50%; + left: 50%; + z-index: @zindexModal; + overflow: auto; + width: 560px; + margin: -250px 0 0 -280px; + background-color: @white; + border: 1px solid #999; + border: 1px solid rgba(0,0,0,.3); + *border: 1px solid #999; /* IE6-7 */ + .border-radius(6px); + .box-shadow(0 3px 7px rgba(0,0,0,0.3)); + .background-clip(padding-box); + &.fade { + .transition(e('opacity .3s linear, top .3s ease-out')); + top: -25%; + } + &.fade.in { top: 50%; } +} +.modal-header { + padding: 9px 15px; + border-bottom: 1px solid #eee; + // Close icon + .close { margin-top: 2px; } + // Heading + h3 { + margin: 0; + line-height: 30px; + } +} + +// Body (where all modal content resides) +.modal-body { + overflow-y: auto; + max-height: 400px; + padding: 15px; +} +// Remove bottom margin if need be +.modal-form { + margin-bottom: 0; +} + +// Footer (for actions) +.modal-footer { + padding: 14px 15px 15px; + margin-bottom: 0; + text-align: right; // right align buttons + background-color: #f5f5f5; + border-top: 1px solid #ddd; + .border-radius(0 0 6px 6px); + .box-shadow(inset 0 1px 0 @white); + .clearfix(); // clear it in case folks use .pull-* classes on buttons + + // Properly space out buttons + .btn + .btn { + margin-left: 5px; + margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs + } + // but override that for button groups + .btn-group .btn + .btn { + margin-left: -1px; + } +} +// +// Tooltips +// -------------------------------------------------- + + +// Base class +.tooltip { + position: absolute; + z-index: @zindexTooltip; + display: block; + visibility: visible; + padding: 5px; + font-size: 11px; + .opacity(0); + &.in { .opacity(80); } + &.top { margin-top: -3px; } + &.right { margin-left: 3px; } + &.bottom { margin-top: 3px; } + &.left { margin-left: -3px; } +} + +// Wrapper for the tooltip content +.tooltip-inner { + max-width: 200px; + padding: 3px 8px; + color: @tooltipColor; + text-align: center; + text-decoration: none; + background-color: @tooltipBackground; + .border-radius(4px); +} + +// Arrows +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.tooltip { + &.top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -@tooltipArrowWidth; + border-width: @tooltipArrowWidth @tooltipArrowWidth 0; + border-top-color: @tooltipArrowColor; + } + &.right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -@tooltipArrowWidth; + border-width: @tooltipArrowWidth @tooltipArrowWidth @tooltipArrowWidth 0; + border-right-color: @tooltipArrowColor; + } + &.left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -@tooltipArrowWidth; + border-width: @tooltipArrowWidth 0 @tooltipArrowWidth @tooltipArrowWidth; + border-left-color: @tooltipArrowColor; + } + &.bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -@tooltipArrowWidth; + border-width: 0 @tooltipArrowWidth @tooltipArrowWidth; + border-bottom-color: @tooltipArrowColor; + } +} +// +// Popovers +// -------------------------------------------------- + + +.popover { + position: absolute; + top: 0; + left: 0; + z-index: @zindexPopover; + display: none; + width: 236px; + padding: 1px; + background-color: @popoverBackground; + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.2); + .border-radius(6px); + .box-shadow(0 5px 10px rgba(0,0,0,.2)); + + // Offset the popover to account for the popover arrow + &.top { margin-bottom: 10px; } + &.right { margin-left: 10px; } + &.bottom { margin-top: 10px; } + &.left { margin-right: 10px; } + +} + +.popover-title { + margin: 0; // reset heading margin + padding: 8px 14px; + font-size: 14px; + font-weight: normal; + line-height: 18px; + background-color: @popoverTitleBackground; + border-bottom: 1px solid darken(@popoverTitleBackground, 5%); + .border-radius(5px 5px 0 0); +} + +.popover-content { + padding: 9px 14px; + p, ul, ol { + margin-bottom: 0; + } +} + +// Arrows +.popover .arrow, +.popover .arrow:after { + position: absolute; + display: inline-block; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.popover .arrow:after { + content: ""; + z-index: -1; +} + +.popover { + &.top .arrow { + bottom: -@popoverArrowWidth; + left: 50%; + margin-left: -@popoverArrowWidth; + border-width: @popoverArrowWidth @popoverArrowWidth 0; + border-top-color: @popoverArrowColor; + &:after { + border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0; + border-top-color: @popoverArrowOuterColor; + bottom: -1px; + left: -@popoverArrowOuterWidth; + } + } + &.right .arrow { + top: 50%; + left: -@popoverArrowWidth; + margin-top: -@popoverArrowWidth; + border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0; + border-right-color: @popoverArrowColor; + &:after { + border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0; + border-right-color: @popoverArrowOuterColor; + bottom: -@popoverArrowOuterWidth; + left: -1px; + } + } + &.bottom .arrow { + top: -@popoverArrowWidth; + left: 50%; + margin-left: -@popoverArrowWidth; + border-width: 0 @popoverArrowWidth @popoverArrowWidth; + border-bottom-color: @popoverArrowColor; + &:after { + border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; + border-bottom-color: @popoverArrowOuterColor; + top: -1px; + left: -@popoverArrowOuterWidth; + } + } + &.left .arrow { + top: 50%; + right: -@popoverArrowWidth; + margin-top: -@popoverArrowWidth; + border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth; + border-left-color: @popoverArrowColor; + &:after { + border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; + border-left-color: @popoverArrowOuterColor; + bottom: -@popoverArrowOuterWidth; + right: -1px; + } + } +} + +// Components: Misc +// +// Thumbnails +// -------------------------------------------------- + + +// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files + +// Make wrapper ul behave like the grid +.thumbnails { + margin-left: -@gridGutterWidth; + list-style: none; + .clearfix(); +} +// Fluid rows have no left margin +.row-fluid .thumbnails { + margin-left: 0; +} + +// Float li to make thumbnails appear in a row +.thumbnails > li { + float: left; // Explicity set the float since we don't require .span* classes + margin-bottom: @baseLineHeight; + margin-left: @gridGutterWidth; +} + +// The actual thumbnail (can be `a` or `div`) +.thumbnail { + display: block; + padding: 4px; + line-height: @baseLineHeight; + border: 1px solid #ddd; + .border-radius(4px); + .box-shadow(0 1px 3px rgba(0,0,0,.055)); + .transition(all .2s ease-in-out); +} +// Add a hover state for linked versions only +a.thumbnail:hover { + border-color: @linkColor; + .box-shadow(0 1px 4px rgba(0,105,214,.25)); +} + +// Images and captions +.thumbnail > img { + display: block; + max-width: 100%; + margin-left: auto; + margin-right: auto; +} +.thumbnail .caption { + padding: 9px; + color: @gray; +} +// +// Labels and badges +// -------------------------------------------------- + + +// Base classes +.label, +.badge { + font-size: @baseFontSize * .846; + font-weight: bold; + line-height: 14px; // ensure proper line-height if floated + color: @white; + vertical-align: baseline; + white-space: nowrap; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + background-color: @grayLight; +} +// Set unique padding and border-radii +.label { + padding: 1px 4px 2px; + .border-radius(3px); +} +.badge { + padding: 1px 9px 2px; + .border-radius(9px); +} + +// Hover state, but only for links +a { + &.label:hover, + &.badge:hover { + color: @white; + text-decoration: none; + cursor: pointer; + } +} + +// Colors +// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute) +.label, +.badge { + // Important (red) + &-important { background-color: @errorText; } + &-important[href] { background-color: darken(@errorText, 10%); } + // Warnings (orange) + &-warning { background-color: @orange; } + &-warning[href] { background-color: darken(@orange, 10%); } + // Success (green) + &-success { background-color: @successText; } + &-success[href] { background-color: darken(@successText, 10%); } + // Info (turquoise) + &-info { background-color: @infoText; } + &-info[href] { background-color: darken(@infoText, 10%); } + // Inverse (black) + &-inverse { background-color: @grayDark; } + &-inverse[href] { background-color: darken(@grayDark, 10%); } +} + +// Quick fix for labels/badges in buttons +.btn { + .label, + .badge { + position: relative; + top: -1px; + } +} +.btn-mini { + .label, + .badge { + top: 0; + } +} +// +// Progress bars +// -------------------------------------------------- + + +// ANIMATIONS +// ---------- + +// Webkit +@-webkit-keyframes progress-bar-stripes { + from { background-position: 40px 0; } + to { background-position: 0 0; } +} + +// Firefox +@-moz-keyframes progress-bar-stripes { + from { background-position: 40px 0; } + to { background-position: 0 0; } +} + +// IE9 +@-ms-keyframes progress-bar-stripes { + from { background-position: 40px 0; } + to { background-position: 0 0; } +} + +// Opera +@-o-keyframes progress-bar-stripes { + from { background-position: 0 0; } + to { background-position: 40px 0; } +} + +// Spec +@keyframes progress-bar-stripes { + from { background-position: 40px 0; } + to { background-position: 0 0; } +} + + + +// THE BARS +// -------- + +// Outer container +.progress { + overflow: hidden; + height: @baseLineHeight; + margin-bottom: @baseLineHeight; + #gradient > .vertical(#f5f5f5, #f9f9f9); + .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); + .border-radius(4px); +} + +// Bar of progress +.progress .bar { + width: 0%; + height: 100%; + color: @white; + float: left; + font-size: 12px; + text-align: center; + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + #gradient > .vertical(#149bdf, #0480be); + .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); + .box-sizing(border-box); + .transition(width .6s ease); +} +.progress .bar + .bar { + .box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)); +} + +// Striped bars +.progress-striped .bar { + #gradient > .striped(#149bdf); + .background-size(40px 40px); +} + +// Call animation for the active one +.progress.active .bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + -ms-animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} + + + +// COLORS +// ------ + +// Danger (red) +.progress-danger .bar, .progress .bar-danger { + #gradient > .vertical(#ee5f5b, #c43c35); +} +.progress-danger.progress-striped .bar, .progress-striped .bar-danger { + #gradient > .striped(#ee5f5b); +} + +// Success (green) +.progress-success .bar, .progress .bar-success { + #gradient > .vertical(#62c462, #57a957); +} +.progress-success.progress-striped .bar, .progress-striped .bar-success { + #gradient > .striped(#62c462); +} + +// Info (teal) +.progress-info .bar, .progress .bar-info { + #gradient > .vertical(#5bc0de, #339bb9); +} +.progress-info.progress-striped .bar, .progress-striped .bar-info { + #gradient > .striped(#5bc0de); +} + +// Warning (orange) +.progress-warning .bar, .progress .bar-warning { + #gradient > .vertical(lighten(@orange, 15%), @orange); +} +.progress-warning.progress-striped .bar, .progress-striped .bar-warning { + #gradient > .striped(lighten(@orange, 15%)); +} +// +// Accordion +// -------------------------------------------------- + + +// Parent container +.accordion { + margin-bottom: @baseLineHeight; +} + +// Group == heading + body +.accordion-group { + margin-bottom: 2px; + border: 1px solid #e5e5e5; + .border-radius(4px); +} +.accordion-heading { + border-bottom: 0; +} +.accordion-heading .accordion-toggle { + display: block; + padding: 8px 15px; +} + +// General toggle styles +.accordion-toggle { + cursor: pointer; +} + +// Inner needs the styles because you can't animate properly with any styles on the element +.accordion-inner { + padding: 9px 15px; + border-top: 1px solid #e5e5e5; +} +// +// Carousel +// -------------------------------------------------- + + +.carousel { + position: relative; + margin-bottom: @baseLineHeight; + line-height: 1; +} + +.carousel-inner { + overflow: hidden; + width: 100%; + position: relative; +} + +.carousel { + + .item { + display: none; + position: relative; + .transition(.6s ease-in-out left); + } + + // Account for jankitude on images + .item > img { + display: block; + line-height: 1; + } + + .active, + .next, + .prev { display: block; } + + .active { + left: 0; + } + + .next, + .prev { + position: absolute; + top: 0; + width: 100%; + } + + .next { + left: 100%; + } + .prev { + left: -100%; + } + .next.left, + .prev.right { + left: 0; + } + + .active.left { + left: -100%; + } + .active.right { + left: 100%; + } + +} + +// Left/right controls for nav +// --------------------------- + +.carousel-control { + position: absolute; + top: 40%; + left: 15px; + width: 40px; + height: 40px; + margin-top: -20px; + font-size: 60px; + font-weight: 100; + line-height: 30px; + color: @white; + text-align: center; + background: @grayDarker; + border: 3px solid @white; + .border-radius(23px); + .opacity(50); + + // we can't have this transition here + // because webkit cancels the carousel + // animation if you trip this while + // in the middle of another animation + // ;_; + // .transition(opacity .2s linear); + + // Reposition the right one + &.right { + left: auto; + right: 15px; + } + + // Hover state + &:hover { + color: @white; + text-decoration: none; + .opacity(90); + } +} + + +// Caption for text below images +// ----------------------------- + +.carousel-caption { + position: absolute; + left: 0; + right: 0; + bottom: 0; + padding: 15px; + background: @grayDark; + background: rgba(0,0,0,.75); +} +.carousel-caption h4, +.carousel-caption p { + color: @white; + line-height: @baseLineHeight; +} +.carousel-caption h4 { + margin: 0 0 5px; +} +.carousel-caption p { + margin-bottom: 0; +} +// +// Hero unit +// -------------------------------------------------- + + +.hero-unit { + padding: 60px; + margin-bottom: 30px; + background-color: @heroUnitBackground; + .border-radius(6px); + h1 { + margin-bottom: 0; + font-size: 60px; + line-height: 1; + color: @heroUnitHeadingColor; + letter-spacing: -1px; + } + p { + font-size: 18px; + font-weight: 200; + line-height: @baseLineHeight * 1.5; + color: @heroUnitLeadColor; + } +} + +// Utility classes +// +// Utility classes +// -------------------------------------------------- + + +// Quick floats +.pull-right { + float: right; +} +.pull-left { + float: left; +} + +// Toggling content +.hide { + display: none; +} +.show { + display: block; +} + +// Visibility +.invisible { + visibility: hidden; +} + +// For Affix plugin +.affix { + position: fixed; +} diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/customize.less b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/customize.less similarity index 94% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/customize.less rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/customize.less index 67fcce7..ef0f69e 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/customize.less +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/customize.less @@ -1,323 +1,323 @@ -body { - padding-top: 80px; -} - -header, -article, -footer { - margin: 0 40px; -} - -footer { - margin-top: 20px; - margin-bottom: 20px; - .well; -} - -table { - .table; - .table-bordered; - .table-condensed; - width: auto; -} - -label { - display: inline-block; -} - -.navbar-fixed-top .navbar-inner { - padding-right: 40px; - padding-left: 40px; -} - -.breadcrumb { - padding: 8px 40px; - margin: 0; - #gradient > .vertical-three-colors(#ffffff, #ffffff, 70%, rgba(255,255,255,0.0)); - background-color: transparent; - .border-radius(0); -} - -.breadcrumb li+li:before { - content: "/ "; - color: #ccc; -} - -button, -a.button, -input[type="button"] { - .btn; - margin-bottom: 9px; -} - -input[type="submit"] { - .btn; - .btn-primary; - margin-bottom: 9px; -} - -input[type="radio"], -input[type="checkbox"] { - margin: 0 4px 0 0; -} - -// Reset .divider class to something we can work with -.dropdown-menu .divider { - *width: 100%; - height: auto; - margin: 0; - overflow: ; - background-color: transparent; - border-bottom: none; - border-top: 1px solid #e5e5e5; -} - -.validationerror { - margin-left: 145px; -} - -/** Rich text editor style */ -.editor-toggle label { - .radio; - .radio.inline; -} - -.editor-toggle input { - margin-left: -18px; -} - -/** Collapsable section */ -.collapsible { - background: transparent; - margin: 5px 0px 5px 0px; - border: 1px solid #e5e5e5; - padding: 9.5px; - .border-radius(4px); -} - -.collapsible > div { - margin-left: 16px; -} - -.collapsible.closed > div { - display: none; -} - -.collapsible.invisible { - display: none; -} - -.collapsible p.title { - color: #000; - font-style: italic; - margin: 0; - padding: 0 0 0 18px; -} - -.collapsible p.title { - background: url(../img/minus-sign.png) no-repeat scroll 0 2px transparent; -} - -.collapsible.closed p.title { - background: url(../img/plus-sign.png) no-repeat scroll 0 2px transparent; -} - -.collapsible > ul { - float: right; - margin: 0; -} - -.collapsible > ul li { - display: inline; - padding: 0 .5em; - border-left: 1px solid #e5e5e5; -} - -tr.scenario > td:first-child { - background-image: url("../img/minus-sign.png"); - background-position: 2px 7px; -} - -tr.scenario.closed > td:first-child { - background-image: url("../img/plus-sign.png"); - padding-left: 18px; -} - -.pass { - background-color: darken(@successBackground, 10%); - color: darken(@successText, 30%); -} -.fail { - background-color: darken(@errorBackground, 15%); - color: darken(@errorText, 30%); -} -.error { - padding: 8px 35px 8px 14px; - margin-bottom: @baseLineHeight; - background-color: darken(@warningBackground, 10%); - border: 1px solid darken(@warningBorder, 30%); - .border-radius(4px); - color: darken(@warningText, 30%); -} - - -#test-action { - .test-button(@bgColor) { - .label; - background-color: @bgColor; - display: block; - float: left; - font-size: 14px; - margin-top: 10px; - padding: 3px 6px 3px; - } - .output, - .ok { - .test-button(@successText); - } - .error, - .stop { - .test-button(@errorText); - } -} - -#test-summary { - .progress; - padding: 0; - #progressBar { - .progress .bar; - padding: 0 0 0 .5em; - &.pass { - .progress .bar-success; - } - &.fail { - .progress .bar-danger; - } - &.error { - .progress .bar-warning; - } - } - &.pass { - .label; - .progress .bar-success; - height: 18px; - padding: 2px 0 0 0.5em; - } - &.fail { - .label; - .progress .bar-danger; - height: 18px; - padding: 2px 0 0 0.5em; - } - &.error { - .label; - .progress .bar-warning; - height: 18px; - padding: 2px 0 0 0.5em; - } -} - - -#test-summaries { - .pass { - .label; - padding-left: 18px; - background-color: @successText; - } - .fail { - .label; - padding-left: 18px; - background-color: @errorText; - } - .error { - .label; - padding-left: 18px; - background-color: @warningText; - } - .ignore { - .label; - background-color: @infoText; - } -} - -#error-nav { - float: left; - margin-left: 15px; - position: relative; - top: 0; - width: 290px; - position: relative; - background-color: darken(@errorBackground, 15%); - color: darken(@errorText, 30%); -} -#error-nav-label { - float: left; - margin-left: 10px; - margin-top: 13px; -} -#error-nav-controls { - position: absolute; - top: 0; - width: 170px; - postition: absolute; - left: 130px; - margin-top: 5px; -} -#error-nav button { - top: 0; - width: 30px; -} -#error-nav input { - top: 0; - width: 40px; -} -.error-nav-hidden{ - display: none; -} - - - -// Specific pages: - -.propertiesPage form, -.searchForm form, -.refactorForm form { - border-bottom: none; -} - -.editPage fieldset { - margin-left: 40px; - margin-right: 40px; -} -.editPage .textarea-toolbar, -.editPage .wysiwyg-toolbar { - margin-left: 40px; -} - -.editPage textarea#pageContent { - border-left: none; - border-right: none; -} -.editPage iframe.wysiwyg { - border-left: none; - border-right: none; -} -.editPage #pagename, -.editPage #helptext { - margin-bottom: 0.5em; - .input-xxlarge; -} - -.tagsinput .tag { - .badge; - background-color: @infoText; - border: none; -} - -.tagsinput .tag a { - color: @errorText; -} - -body.editing { - padding: 0 40px; -} +body { + padding-top: 80px; +} + +header, +article, +footer { + margin: 0 40px; +} + +footer { + margin-top: 20px; + margin-bottom: 20px; + .well; +} + +table { + .table; + .table-bordered; + .table-condensed; + width: auto; +} + +label { + display: inline-block; +} + +.navbar-fixed-top .navbar-inner { + padding-right: 40px; + padding-left: 40px; +} + +.breadcrumb { + padding: 8px 40px; + margin: 0; + #gradient > .vertical-three-colors(#ffffff, #ffffff, 70%, rgba(255,255,255,0.0)); + background-color: transparent; + .border-radius(0); +} + +.breadcrumb li+li:before { + content: "/ "; + color: #ccc; +} + +button, +a.button, +input[type="button"] { + .btn; + margin-bottom: 9px; +} + +input[type="submit"] { + .btn; + .btn-primary; + margin-bottom: 9px; +} + +input[type="radio"], +input[type="checkbox"] { + margin: 0 4px 0 0; +} + +// Reset .divider class to something we can work with +.dropdown-menu .divider { + *width: 100%; + height: auto; + margin: 0; + overflow: ; + background-color: transparent; + border-bottom: none; + border-top: 1px solid #e5e5e5; +} + +.validationerror { + margin-left: 145px; +} + +/** Rich text editor style */ +.editor-toggle label { + .radio; + .radio.inline; +} + +.editor-toggle input { + margin-left: -18px; +} + +/** Collapsable section */ +.collapsible { + background: transparent; + margin: 5px 0px 5px 0px; + border: 1px solid #e5e5e5; + padding: 9.5px; + .border-radius(4px); +} + +.collapsible > div { + margin-left: 16px; +} + +.collapsible.closed > div { + display: none; +} + +.collapsible.invisible { + display: none; +} + +.collapsible p.title { + color: #000; + font-style: italic; + margin: 0; + padding: 0 0 0 18px; +} + +.collapsible p.title { + background: url(../img/minus-sign.png) no-repeat scroll 0 2px transparent; +} + +.collapsible.closed p.title { + background: url(../img/plus-sign.png) no-repeat scroll 0 2px transparent; +} + +.collapsible > ul { + float: right; + margin: 0; +} + +.collapsible > ul li { + display: inline; + padding: 0 .5em; + border-left: 1px solid #e5e5e5; +} + +tr.scenario > td:first-child { + background-image: url("../img/minus-sign.png"); + background-position: 2px 7px; +} + +tr.scenario.closed > td:first-child { + background-image: url("../img/plus-sign.png"); + padding-left: 18px; +} + +.pass { + background-color: darken(@successBackground, 10%); + color: darken(@successText, 30%); +} +.fail { + background-color: darken(@errorBackground, 15%); + color: darken(@errorText, 30%); +} +.error { + padding: 8px 35px 8px 14px; + margin-bottom: @baseLineHeight; + background-color: darken(@warningBackground, 10%); + border: 1px solid darken(@warningBorder, 30%); + .border-radius(4px); + color: darken(@warningText, 30%); +} + + +#test-action { + .test-button(@bgColor) { + .label; + background-color: @bgColor; + display: block; + float: left; + font-size: 14px; + margin-top: 10px; + padding: 3px 6px 3px; + } + .output, + .ok { + .test-button(@successText); + } + .error, + .stop { + .test-button(@errorText); + } +} + +#test-summary { + .progress; + padding: 0; + #progressBar { + .progress .bar; + padding: 0 0 0 .5em; + &.pass { + .progress .bar-success; + } + &.fail { + .progress .bar-danger; + } + &.error { + .progress .bar-warning; + } + } + &.pass { + .label; + .progress .bar-success; + height: 18px; + padding: 2px 0 0 0.5em; + } + &.fail { + .label; + .progress .bar-danger; + height: 18px; + padding: 2px 0 0 0.5em; + } + &.error { + .label; + .progress .bar-warning; + height: 18px; + padding: 2px 0 0 0.5em; + } +} + + +#test-summaries { + .pass { + .label; + padding-left: 18px; + background-color: @successText; + } + .fail { + .label; + padding-left: 18px; + background-color: @errorText; + } + .error { + .label; + padding-left: 18px; + background-color: @warningText; + } + .ignore { + .label; + background-color: @infoText; + } +} + +#error-nav { + float: left; + margin-left: 15px; + position: relative; + top: 0; + width: 290px; + position: relative; + background-color: darken(@errorBackground, 15%); + color: darken(@errorText, 30%); +} +#error-nav-label { + float: left; + margin-left: 10px; + margin-top: 13px; +} +#error-nav-controls { + position: absolute; + top: 0; + width: 170px; + postition: absolute; + left: 130px; + margin-top: 5px; +} +#error-nav button { + top: 0; + width: 30px; +} +#error-nav input { + top: 0; + width: 40px; +} +.error-nav-hidden{ + display: none; +} + + + +// Specific pages: + +.propertiesPage form, +.searchForm form, +.refactorForm form { + border-bottom: none; +} + +.editPage fieldset { + margin-left: 40px; + margin-right: 40px; +} +.editPage .textarea-toolbar, +.editPage .wysiwyg-toolbar { + margin-left: 40px; +} + +.editPage textarea#pageContent { + border-left: none; + border-right: none; +} +.editPage iframe.wysiwyg { + border-left: none; + border-right: none; +} +.editPage #pagename, +.editPage #helptext { + margin-bottom: 0.5em; + .input-xxlarge; +} + +.tagsinput .tag { + .badge; + background-color: @infoText; + border: none; +} + +.tagsinput .tag a { + color: @errorText; +} + +body.editing { + padding: 0 40px; +} diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/fitnesse-bootstrap.less b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/fitnesse-bootstrap.less similarity index 95% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/fitnesse-bootstrap.less rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/fitnesse-bootstrap.less index 386eab0..e1245fa 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/fitnesse-bootstrap.less +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/fitnesse-bootstrap.less @@ -1,16 +1,16 @@ -/*! - * FitNesse Bootstrap theme. - * - * Original header: - * - * Bootstrap v2.1.1 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ -@import "bootstrap-merged.less"; - -@import "customize.less"; +/*! + * FitNesse Bootstrap theme. + * + * Original header: + * + * Bootstrap v2.1.1 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ +@import "bootstrap-merged.less"; + +@import "customize.less"; diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/merge-bootstrap.py b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/merge-bootstrap.py similarity index 95% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/merge-bootstrap.py rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/merge-bootstrap.py index 3e0df52..87c736f 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/less/merge-bootstrap.py +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/less/merge-bootstrap.py @@ -1,12 +1,12 @@ - - -def merge(filename): - for l in file(filename): - if l.startswith("@import"): - merged_filename = l.split('"')[1]; - merge(merged_filename) - else: - print l, - -if __name__ == '__main__': - merge("bootstrap.less") + + +def merge(filename): + for l in file(filename): + if l.startswith("@import"): + merged_filename = l.split('"')[1]; + merge(merged_filename) + else: + print l, + +if __name__ == '__main__': + merge("bootstrap.less") diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/breadcrumb.vm b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/breadcrumb.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/breadcrumb.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/breadcrumb.vm index 1abd630..0d29e1d 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/breadcrumb.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/breadcrumb.vm @@ -1,7 +1,7 @@ - - + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/header.vm b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/header.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/header.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/header.vm index 49254a2..d7bbcd9 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/header.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/header.vm @@ -1,6 +1,6 @@ -#if(!$pageTitle.Link) -

      $pageTitle.Title #if($pageTitle.pageTags)$pageTitle.pageTags#end

      - #if( $!helpText ) -

      $helpText

      - #end +#if(!$pageTitle.Link) +

      $pageTitle.Title #if($pageTitle.pageTags)$pageTitle.pageTags#end

      + #if( $!helpText ) +

      $helpText

      + #end #end \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/skeleton.vm b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/skeleton.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/skeleton.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/skeleton.vm index c3eb36d..f5a8f8c 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/skeleton.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/skeleton.vm @@ -1,64 +1,64 @@ - - - - #if( $baseUri )#end - - $title - ## Deal with HTML 5 element in older IE browsers - - - - - - - - - - - - - - - - - - - - - - - - #if( $!errorNavTemplate ) - #parse( $errorNavTemplate ) - #end - -
      - #parse( $headerTemplate ) -
      - -
      - #parse( $mainTemplate ) -
      - - #if( $!footerTemplate ) -
      - #parse( $footerTemplate ) -
      - #end - - - + + + + #if( $baseUri )#end + + $title + ## Deal with HTML 5 element in older IE browsers + + + + + + + + + + + + + + + + + + + + + + + + #if( $!errorNavTemplate ) + #parse( $errorNavTemplate ) + #end + +
      + #parse( $headerTemplate ) +
      + +
      + #parse( $mainTemplate ) +
      + + #if( $!footerTemplate ) +
      + #parse( $footerTemplate ) +
      + #end + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/testNav.vm b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/testNav.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/testNav.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/testNav.vm index c2a9706..7b59dba 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/testNav.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/testNav.vm @@ -1,21 +1,21 @@ -## The menu is only shown after the page executed. - - - - -## The error navigator is also hidden until page is complete. -
      -

      Failure Navigator

      -
      - - - of - -
      +## The menu is only shown after the page executed. + + + + +## The error navigator is also hidden until page is complete. +
      +

      Failure Navigator

      +
      + + + of + +
      \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/versionNav.vm b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/versionNav.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/versionNav.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/versionNav.vm index 1c6b3f2..b455ba8 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/versionNav.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/versionNav.vm @@ -1,10 +1,10 @@ - + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/viewNav.vm b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/viewNav.vm similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/viewNav.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/viewNav.vm diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/wikiNav.vm b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/wikiNav.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/wikiNav.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/wikiNav.vm index 10bd33b..332d476 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/bootstrap/templates/wikiNav.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/bootstrap/templates/wikiNav.vm @@ -1,77 +1,77 @@ -#set( $localPath = $actions.localPageName ) -#set( $localOrRemotePath = $actions.localOrRemotePageName ) -#set( $openInNewWindow = $actions.newWindowIfRemote ) -
        - #if( $actions.suitePage ) -
      • Suite
        • - #end - #if( $actions.testPage ) -
      • Test
        • - #end - #if( $actions.withEdit && !$actions.imported) -
      • Edit
        • - #end - #if( $actions.imported ) -
      • Edit Locally
        • - #end - #if( $actions.imported ) -
      • Edit Remotely
        • - #end - - #if( $actions.withEdit) - - #end - - -
      - -
      - - - -
      +#set( $localPath = $actions.localPageName ) +#set( $localOrRemotePath = $actions.localOrRemotePageName ) +#set( $openInNewWindow = $actions.newWindowIfRemote ) +
        + #if( $actions.suitePage ) +
      • Suite
        • + #end + #if( $actions.testPage ) +
      • Test
        • + #end + #if( $actions.withEdit && !$actions.imported) +
      • Edit
        • + #end + #if( $actions.imported ) +
      • Edit Locally
        • + #end + #if( $actions.imported ) +
      • Edit Remotely
        • + #end + + #if( $actions.withEdit) + + #end + + +
      + +
      + + + +
      diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse.css b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse.css similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse.css rename to src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse.css index db518e4..345ebb5 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse.css +++ b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse.css @@ -1,5 +1,5 @@ -@import url( "fitnesse_pages.css" ); -@import url( "fitnesse_wiki.css" ); - -/*@import url( "fitnesse_mint.css" );*/ -@import url( "fitnesse_straight.css" ); +@import url( "fitnesse_pages.css" ); +@import url( "fitnesse_wiki.css" ); + +/*@import url( "fitnesse_mint.css" );*/ +@import url( "fitnesse_straight.css" ); diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_classic.css b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_classic.css similarity index 93% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_classic.css rename to src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_classic.css index 24389ad..d0637b1 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_classic.css +++ b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_classic.css @@ -1,177 +1,177 @@ -header, -footer, -article, -section, -aside, -nav { - display:block; -} -body { - padding: 0; - margin: 0; - background-color: #fafafe; - font-family: 'Lucida Grande','Bitstream Vera Sans','trebuchet ms',verdana,tahoma,arial,sans-serif; -} -header { - position: fixed; - left: 0; - top: 0; - right: 0; - padding: 8px; - height: 90px; - background-color: #d9dfc9; - border-bottom: 1px solid gray; -} -#art_niche { - float: left; - background-image: url("../images/FitNesseLogo.png"); - width: 90px; - height: 90px; - margin: 0 68px 0 4px; -} -#art_niche span { - display: none; -} -header ul { - list-style: none; -} - -header li { - display: inline-block; -} -header li+li:before { - content: " ."; -} - -header h5 { - color: #aaaaaa; - font: bold 2em; - font-weight: normal; - letter-spacing: 0.08em; - position: fixed; - top: -17px; - right: 20px; -} - -nav { - position: fixed; - left: 0; - top: 108px; - width: 130px; - bottom: 0; - background-color: #d9dfc9; -} - -nav ul { - display: block; - margin: 0; - padding: 0; -} - -nav li { - list-style: none; - margin: 4px; -} - -nav li.divider { - border-top: 1px solid #A8AC9C; -} - -nav li a, nav li a:visited { - display: block; - padding: 6px 4px; - border: 1px solid gray; - width: 112px; - text-decoration: none; - color: black; - background-color: #eee; -} - -nav li a:hover { - background-color: #f8f8f8; -} - -nav ul ul { - background: #eee; /* Adding a background makes the dropdown work properly in IE7+. */ - -moz-box-shadow: 0 3px 10px #4A4A44; - position: absolute; - display: none; - z-index: 999; - margin: -20px 0 0 20px; -} - -nav ul ul li { - margin: 0px; -} - -nav ul ul li a { - border: none; -} - -nav li:hover ul { - display: block; -} - -article { - margin: 120px 24px 24px 170px; -} - -table { - border: thin solid #000; - border-collapse:collapse; -} - -td, th { - border: thin solid #000; - padding: 0.25em 0.5em; - border-collapse:collapse; -} - -footer { - margin-left: 170px; - padding: 20px; - font-size: 75%; - border-top: 1px solid #984D00; - text-align: center; -} - -#error-nav { - position: fixed; - right: 0px; - top: 0px; - font-weight: bold; - border-width: 3px; - border-style: solid; - border-color: Black; - height: 75px; - width: 180px; - background-color: #FFAAAA ; -} - -#error-nav-label { - text-align: center; - line-height: 50%; -} - -#error-nav-controls { - text-align: center; -} - -#error-nav button{ - width: 30px; -} - -#error-nav input{ - width: 40px; -} - -.error-nav-hidden{ - visibility:hidden; -} - -.selected-error{ - border-style:solid; - border-width:4px; - border-color:SlateGray; -} - +header, +footer, +article, +section, +aside, +nav { + display:block; +} +body { + padding: 0; + margin: 0; + background-color: #fafafe; + font-family: 'Lucida Grande','Bitstream Vera Sans','trebuchet ms',verdana,tahoma,arial,sans-serif; +} +header { + position: fixed; + left: 0; + top: 0; + right: 0; + padding: 8px; + height: 90px; + background-color: #d9dfc9; + border-bottom: 1px solid gray; +} +#art_niche { + float: left; + background-image: url("../images/FitNesseLogo.png"); + width: 90px; + height: 90px; + margin: 0 68px 0 4px; +} +#art_niche span { + display: none; +} +header ul { + list-style: none; +} + +header li { + display: inline-block; +} +header li+li:before { + content: " ."; +} + +header h5 { + color: #aaaaaa; + font: bold 2em; + font-weight: normal; + letter-spacing: 0.08em; + position: fixed; + top: -17px; + right: 20px; +} + +nav { + position: fixed; + left: 0; + top: 108px; + width: 130px; + bottom: 0; + background-color: #d9dfc9; +} + +nav ul { + display: block; + margin: 0; + padding: 0; +} + +nav li { + list-style: none; + margin: 4px; +} + +nav li.divider { + border-top: 1px solid #A8AC9C; +} + +nav li a, nav li a:visited { + display: block; + padding: 6px 4px; + border: 1px solid gray; + width: 112px; + text-decoration: none; + color: black; + background-color: #eee; +} + +nav li a:hover { + background-color: #f8f8f8; +} + +nav ul ul { + background: #eee; /* Adding a background makes the dropdown work properly in IE7+. */ + -moz-box-shadow: 0 3px 10px #4A4A44; + position: absolute; + display: none; + z-index: 999; + margin: -20px 0 0 20px; +} + +nav ul ul li { + margin: 0px; +} + +nav ul ul li a { + border: none; +} + +nav li:hover ul { + display: block; +} + +article { + margin: 120px 24px 24px 170px; +} + +table { + border: thin solid #000; + border-collapse:collapse; +} + +td, th { + border: thin solid #000; + padding: 0.25em 0.5em; + border-collapse:collapse; +} + +footer { + margin-left: 170px; + padding: 20px; + font-size: 75%; + border-top: 1px solid #984D00; + text-align: center; +} + +#error-nav { + position: fixed; + right: 0px; + top: 0px; + font-weight: bold; + border-width: 3px; + border-style: solid; + border-color: Black; + height: 75px; + width: 180px; + background-color: #FFAAAA ; +} + +#error-nav-label { + text-align: center; + line-height: 50%; +} + +#error-nav-controls { + text-align: center; +} + +#error-nav button{ + width: 30px; +} + +#error-nav input{ + width: 40px; +} + +.error-nav-hidden{ + visibility:hidden; +} + +.selected-error{ + border-style:solid; + border-width:4px; + border-color:SlateGray; +} + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_mint.css b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_mint.css similarity index 93% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_mint.css rename to src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_mint.css index 0ce2256..94e14ea 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_mint.css +++ b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_mint.css @@ -1,231 +1,231 @@ -/* ****************** -Style colors: -Base: #DADFCA -DarkerBase: #969789 -DarkGray: #494A43 -Green: #CFE48A -DarkGreen: #474A2D -******************* */ - -/* BASIC CSS */ - -/* Makeshift CSS Reset */ -{ - margin: 0; - padding: 0; -} - -body { - margin: 0; - padding: 0; - font-family: 'Arial','Helvetica',sans-serif; - font-size: small; - background:#979789; - color:#333; -} -/* Tell the browser to render HTML 5 elements as block */ -header, footer, aside, nav, article { - display: block; -} - -img { - border:0; -} - -a, a:active, a:link, a:visited { - text-decoration: none; - color:#8A8A7D; -} - -h1, h2, h3, h4, h5, h6 { - color: #5D5F56; - font-family: Helvetica,Arial; - font-weight: bold; - line-height: 1.1em; - padding-bottom: 5px; - text-shadow: 0 1px 0 #FFFFFF; - font-size:xx-large; -} - -/* HEADER */ -header { - background:#d9dfc9; - padding:20px; -} - - -header ul { - list-style: none; - margin: 10px 0; - padding:0; -} - -header li { - display: inline-block; -} - -header h1 { - margin: 20px 20px 0 0; - font-size:xx-large; - color:#4A4A2E; -} - -header h5 { - color: #aaaaaa; - margin: 0px 0px 0 0; - font-size: 10pt; -} - -#art_niche { - display:block; - background: url("../images/fit_mint.png") top left no-repeat; - width: 156px; - height: 49px; -} -#art_niche span{ - display:none; -} - - -/* NAVIGATION */ - -nav { - float:left; - background:#4A4A44; - width:100%; - height:25px; -} - -nav ul { - padding: 5px 0 5px 0; - margin:0; -} - -nav ul li { - display: block; - float: left; - list-style: none; - margin-right: 0.5em; - z-index: 99; -} - -nav a, nav a:link, nav a:active, nav a:visited { - white-space:nowrap; - text-decoration: none; - color: #D6D6C5; - padding: 0.3em 3em 0.3em 3em; -} - -nav ul ul { - background: #4A4A44; /* Adding a background makes the dropdown work properly in IE7+. */ - -moz-box-shadow: 0 3px 10px #4A4A44; - position: absolute; - display: none; - z-index: 999; - margin: 0; - padding: 10px 0 10px 0; -} - -nav li.divider { - border-top: 1px solid #A8AC9C; -} - -nav ul ul li { - float: none; - display: block; - line-height: 1.5em; - margin: 0; -} - -nav ul ul li a { - display: block; - padding:5px 0px 5px 0px; - border: none; -} - -nav li:hover ul { - display: block; -} - -/* ARTICLE */ - -article { - padding: 40px 40px 80px 40px; - background:#fff; - margin: 0 20px 0 20px; - -moz-box-shadow: 2px 2px 2px #494A43; --webkit-box-shadow: 2px 2px 2px #494A43; -box-shadow: 2px 2px 2px #494A43; - - -} - -table { - border: thin solid #5D5F56; - border-collapse:collapse; -} -td, th { - border: thin solid #5D5F56; - padding: 0.25em 0.5em; -} - -/* FOOTER */ - -footer { - padding:20px; - color:#D9D9D9; -} - -footer a, footer a:active, footer a:link, footer a:visited { - text-decoration: none; - color:#D9D9D9; -} - -/* TESTS */ -#test-action .ok, -#test-action .output { - font-weight: bold; - color: white; -} - -#error-nav { - position: fixed; - right: 0px; - top: 0px; - font-weight: bold; - border-width: 3px; - border-style: solid; - border-color: Black; - height: 60px; - width: 180px; - background-color: #FFAAAA ; -} - -#error-nav-label { - text-align: center; - line-height: 50%; -} - -#error-nav-controls { - text-align: center; -} - -#error-nav button{ - width: 30px; -} - -#error-nav input{ - width: 40px; -} - -.error-nav-hidden{ - visibility:hidden; -} - -.selected-error{ - border-style:solid; - border-width:4px; - border-color:SlateGray; -} - - +/* ****************** +Style colors: +Base: #DADFCA +DarkerBase: #969789 +DarkGray: #494A43 +Green: #CFE48A +DarkGreen: #474A2D +******************* */ + +/* BASIC CSS */ + +/* Makeshift CSS Reset */ +{ + margin: 0; + padding: 0; +} + +body { + margin: 0; + padding: 0; + font-family: 'Arial','Helvetica',sans-serif; + font-size: small; + background:#979789; + color:#333; +} +/* Tell the browser to render HTML 5 elements as block */ +header, footer, aside, nav, article { + display: block; +} + +img { + border:0; +} + +a, a:active, a:link, a:visited { + text-decoration: none; + color:#8A8A7D; +} + +h1, h2, h3, h4, h5, h6 { + color: #5D5F56; + font-family: Helvetica,Arial; + font-weight: bold; + line-height: 1.1em; + padding-bottom: 5px; + text-shadow: 0 1px 0 #FFFFFF; + font-size:xx-large; +} + +/* HEADER */ +header { + background:#d9dfc9; + padding:20px; +} + + +header ul { + list-style: none; + margin: 10px 0; + padding:0; +} + +header li { + display: inline-block; +} + +header h1 { + margin: 20px 20px 0 0; + font-size:xx-large; + color:#4A4A2E; +} + +header h5 { + color: #aaaaaa; + margin: 0px 0px 0 0; + font-size: 10pt; +} + +#art_niche { + display:block; + background: url("../images/fit_mint.png") top left no-repeat; + width: 156px; + height: 49px; +} +#art_niche span{ + display:none; +} + + +/* NAVIGATION */ + +nav { + float:left; + background:#4A4A44; + width:100%; + height:25px; +} + +nav ul { + padding: 5px 0 5px 0; + margin:0; +} + +nav ul li { + display: block; + float: left; + list-style: none; + margin-right: 0.5em; + z-index: 99; +} + +nav a, nav a:link, nav a:active, nav a:visited { + white-space:nowrap; + text-decoration: none; + color: #D6D6C5; + padding: 0.3em 3em 0.3em 3em; +} + +nav ul ul { + background: #4A4A44; /* Adding a background makes the dropdown work properly in IE7+. */ + -moz-box-shadow: 0 3px 10px #4A4A44; + position: absolute; + display: none; + z-index: 999; + margin: 0; + padding: 10px 0 10px 0; +} + +nav li.divider { + border-top: 1px solid #A8AC9C; +} + +nav ul ul li { + float: none; + display: block; + line-height: 1.5em; + margin: 0; +} + +nav ul ul li a { + display: block; + padding:5px 0px 5px 0px; + border: none; +} + +nav li:hover ul { + display: block; +} + +/* ARTICLE */ + +article { + padding: 40px 40px 80px 40px; + background:#fff; + margin: 0 20px 0 20px; + -moz-box-shadow: 2px 2px 2px #494A43; +-webkit-box-shadow: 2px 2px 2px #494A43; +box-shadow: 2px 2px 2px #494A43; + + +} + +table { + border: thin solid #5D5F56; + border-collapse:collapse; +} +td, th { + border: thin solid #5D5F56; + padding: 0.25em 0.5em; +} + +/* FOOTER */ + +footer { + padding:20px; + color:#D9D9D9; +} + +footer a, footer a:active, footer a:link, footer a:visited { + text-decoration: none; + color:#D9D9D9; +} + +/* TESTS */ +#test-action .ok, +#test-action .output { + font-weight: bold; + color: white; +} + +#error-nav { + position: fixed; + right: 0px; + top: 0px; + font-weight: bold; + border-width: 3px; + border-style: solid; + border-color: Black; + height: 60px; + width: 180px; + background-color: #FFAAAA ; +} + +#error-nav-label { + text-align: center; + line-height: 50%; +} + +#error-nav-controls { + text-align: center; +} + +#error-nav button{ + width: 30px; +} + +#error-nav input{ + width: 40px; +} + +.error-nav-hidden{ + visibility:hidden; +} + +.selected-error{ + border-style:solid; + border-width:4px; + border-color:SlateGray; +} + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_pages.css b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_pages.css similarity index 94% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_pages.css rename to src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_pages.css index 870faf6..b0d6d42 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_pages.css +++ b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_pages.css @@ -1,300 +1,300 @@ -fieldset { - border: none; - padding: 0; - margin: 0; -} -label { - display: inline-block; - padding-right: 16px; - text-align: right; - width: 124px; -} -label input { - margin-right: 8px; -} -.validationerror { - color: maroon; - margin: -6px 0 8px 140px; - font-size: 0.9em -} -.buttons { - margin-left: 145px; /* 140 + input field padding/border/margin */ -} - -/** Wiki pages (wiki, test, suite, report) **/ -.wikiPage td, -.testPage td, -.suitePage td, -.testExecutionReport td, -.compareHistory td { - white-space: pre-line; -} - -/** Edit page **/ -.editPage { - overflow: hidden; -} - -.editPage article { - margin: 0; -} - -.editPage #editor { - margin: 8px 0 0 0; -} - -.editPage #editor label { - width: auto; -} -.editPage .edit_options label { - width: auto; -} - -.editPage #pagename, -.editPage #helptext { - width: 55em; - margin-bottom: 0.5em; -} -.editPage #pagetypes { - margin: 0 0 0.5em 7em; -} -.editPage #pagetypes label { - display: inline; - float: none; -} -.editPage textarea, .editPage iframe { - display: block; - width: 100%; - height: 32em; - font-family: monospace; -} -.editPage textarea.no_wrap { - overflow: scroll; -} -.editPage .edit_options { - float: right; -} -.editPage #save_buttons { - bottom: 0; - margin-top: 16px; - margin-bottom: 7px; /* buttons have 9px bottom padding */ - position: fixed; -} - -.tagsinput { - display: inline; -} -.tagsinput .tag { - background-color: #F9F9F9; - border: 1px dotted #BF8660; - color: #BF8660; - margin-right: 4px; - padding: 2px; - text-decoration: none; -} -.tagsinput .tag a { - font-weight: bold; - text-decoration: none; - margin-left: 4px; -} -.tagsinput input { - background: none repeat scroll 0 0 transparent; - color: #000000; - margin: 0 ; - outline: 0 none; - width: 80px; -} - -/** Properties page / Search form / Directory page**/ -.propertiesPage form, -.searchForm form, -.refactorForm form { - padding-bottom: 1em; - border-bottom: 1px solid #984D00; -} -.propertiesPage .properties, -.searchForm .properties { - margin-left: 145px; -} -.propertiesPage .properties fieldset, -.searchForm .properties fieldset { - display: inline-block; - vertical-align: top; - border: none; -} -.propertiesPage .properties label, -.searchForm .properties label { - display: block; - text-align: left; -} -legend { - font-weight: bold; - margin-bottom: 0.5em; - padding: 0; -} -label input { - margin-right: 0.5em; -} -label.checkbox { - margin-left: 145px; - width: auto; -} -#virtual-wiki-properties { - margin-top: 1em; -} -#create-dir { - width: 140PX; -} - -/** Merge page **/ -.mergePage #merge-new, -.mergePage #merge-old { - float: left; - width: 47%; - margin-right: 1em; -} -.mergePage textarea { - width: 100%; - height: 32em; -} -.mergePage #merge-old textarea{ - background-color: #efefef; -} - -/** Delete page confirmation dialog **/ -.warning { - color: maroon; -} - -/** Test history **/ -.testHistory td { - white-space: pre; -} -.testHistory td a { - text-decoration: none; -} - -/** Test result **/ -tr.scenario > td:first-child, -tr.exception > td:first-child { - padding-left: 16px; - background-image: url("../images/collapsibleOpen.png"); - background-position: 2px; - background-repeat: no-repeat; -} -tr.scenario.closed > td:first-child, -tr.exception.closed > td:first-child { - background-image: url("../images/collapsibleClosed.png"); -} -tr.closed-detail { - display: none; -} -tr.exception-detail { - background-color: #ffffaa; -} -#test-summary, #progressBar { - padding: 0.5em; - padding-left: 1.5em; - background-position: 0 0.3em; -} -#test-summaries ul { - list-style: none; - padding-left: 0; -} -#test_summaries h2, #test-summaries h3 { - text-align: center; -} -#test-summaries .pass, -#test-summaries .fail, -#test-summaries .error, -span.error { - padding: 0px 0px 0px 20px; -} -#test-summary.pass, -#test-summaries .pass { - background-image: url("../images/checkmark.png"); - background-repeat: no-repeat; -} -#test-summary.fail, -#test-summaries .fail { - background-image: url("../images/wrong.png"); - background-repeat: no-repeat; -} -#test-summary.error, -#test-summaries .error, -span.error { - background-image: url("../images/exception.png"); - background-repeat: no-repeat; -} -#test-action .stop { - background-color: red; - color: white; - font-weight: bold; -} -#test-action .error { - background-color: red; -} -.test_output_name h3 { - display: inline; -} - -/** Suite overview */ -.overview_results table { - border: none; -} -.overview_bar { - border: 1px solid black; - height: 1.4em; - margin: 0 -0.5px; -} -.overview_part { - float: left; - height: 1.4em; - margin: 0; - padding: 0; -} -.unrun { - background-color: #FFF3B4; -} - -.passed_tests, .unrun_tests, .failed_tests { - background-repeat: no-repeat; - margin: 0 4px; - padding-left: 22px; -} -.passed_tests { - background-image: url("../images/checkmark.png"); -} -.unrun_tests { - background-image: url("../images/exception.png"); -} -.failed_tests { - background-image: url("../images/wrong.png"); -} - -/** Virtual and import pages */ -.virtual header { - background-image: url("../images/virtualPage.jpg"); - background-position: center top; - background-repeat: no-repeat; -} -.imported header { - background-image: url("../images/importedPage.jpg"); - background-position: center top; - background-repeat: no-repeat; -} - -/** Test Execution report, backwards compatibility */ -.collapse_rim { - background: #F9F9F9; - border: 1px dotted #909090; -} -.collapse_rim > a { - padding-left: 16px; - background: url(../images/collapsibleClosed.png) no-repeat scroll 0 2px transparent; -} -.collapse_rim.open > a { - background: url(../images/collapsibleOpen.png) no-repeat scroll 0 2px transparent; -} - +fieldset { + border: none; + padding: 0; + margin: 0; +} +label { + display: inline-block; + padding-right: 16px; + text-align: right; + width: 124px; +} +label input { + margin-right: 8px; +} +.validationerror { + color: maroon; + margin: -6px 0 8px 140px; + font-size: 0.9em +} +.buttons { + margin-left: 145px; /* 140 + input field padding/border/margin */ +} + +/** Wiki pages (wiki, test, suite, report) **/ +.wikiPage td, +.testPage td, +.suitePage td, +.testExecutionReport td, +.compareHistory td { + white-space: pre-line; +} + +/** Edit page **/ +.editPage { + overflow: hidden; +} + +.editPage article { + margin: 0; +} + +.editPage #editor { + margin: 8px 0 0 0; +} + +.editPage #editor label { + width: auto; +} +.editPage .edit_options label { + width: auto; +} + +.editPage #pagename, +.editPage #helptext { + width: 55em; + margin-bottom: 0.5em; +} +.editPage #pagetypes { + margin: 0 0 0.5em 7em; +} +.editPage #pagetypes label { + display: inline; + float: none; +} +.editPage textarea, .editPage iframe { + display: block; + width: 100%; + height: 32em; + font-family: monospace; +} +.editPage textarea.no_wrap { + overflow: scroll; +} +.editPage .edit_options { + float: right; +} +.editPage #save_buttons { + bottom: 0; + margin-top: 16px; + margin-bottom: 7px; /* buttons have 9px bottom padding */ + position: fixed; +} + +.tagsinput { + display: inline; +} +.tagsinput .tag { + background-color: #F9F9F9; + border: 1px dotted #BF8660; + color: #BF8660; + margin-right: 4px; + padding: 2px; + text-decoration: none; +} +.tagsinput .tag a { + font-weight: bold; + text-decoration: none; + margin-left: 4px; +} +.tagsinput input { + background: none repeat scroll 0 0 transparent; + color: #000000; + margin: 0 ; + outline: 0 none; + width: 80px; +} + +/** Properties page / Search form / Directory page**/ +.propertiesPage form, +.searchForm form, +.refactorForm form { + padding-bottom: 1em; + border-bottom: 1px solid #984D00; +} +.propertiesPage .properties, +.searchForm .properties { + margin-left: 145px; +} +.propertiesPage .properties fieldset, +.searchForm .properties fieldset { + display: inline-block; + vertical-align: top; + border: none; +} +.propertiesPage .properties label, +.searchForm .properties label { + display: block; + text-align: left; +} +legend { + font-weight: bold; + margin-bottom: 0.5em; + padding: 0; +} +label input { + margin-right: 0.5em; +} +label.checkbox { + margin-left: 145px; + width: auto; +} +#virtual-wiki-properties { + margin-top: 1em; +} +#create-dir { + width: 140PX; +} + +/** Merge page **/ +.mergePage #merge-new, +.mergePage #merge-old { + float: left; + width: 47%; + margin-right: 1em; +} +.mergePage textarea { + width: 100%; + height: 32em; +} +.mergePage #merge-old textarea{ + background-color: #efefef; +} + +/** Delete page confirmation dialog **/ +.warning { + color: maroon; +} + +/** Test history **/ +.testHistory td { + white-space: pre; +} +.testHistory td a { + text-decoration: none; +} + +/** Test result **/ +tr.scenario > td:first-child, +tr.exception > td:first-child { + padding-left: 16px; + background-image: url("../images/collapsibleOpen.png"); + background-position: 2px; + background-repeat: no-repeat; +} +tr.scenario.closed > td:first-child, +tr.exception.closed > td:first-child { + background-image: url("../images/collapsibleClosed.png"); +} +tr.closed-detail { + display: none; +} +tr.exception-detail { + background-color: #ffffaa; +} +#test-summary, #progressBar { + padding: 0.5em; + padding-left: 1.5em; + background-position: 0 0.3em; +} +#test-summaries ul { + list-style: none; + padding-left: 0; +} +#test_summaries h2, #test-summaries h3 { + text-align: center; +} +#test-summaries .pass, +#test-summaries .fail, +#test-summaries .error, +span.error { + padding: 0px 0px 0px 20px; +} +#test-summary.pass, +#test-summaries .pass { + background-image: url("../images/checkmark.png"); + background-repeat: no-repeat; +} +#test-summary.fail, +#test-summaries .fail { + background-image: url("../images/wrong.png"); + background-repeat: no-repeat; +} +#test-summary.error, +#test-summaries .error, +span.error { + background-image: url("../images/exception.png"); + background-repeat: no-repeat; +} +#test-action .stop { + background-color: red; + color: white; + font-weight: bold; +} +#test-action .error { + background-color: red; +} +.test_output_name h3 { + display: inline; +} + +/** Suite overview */ +.overview_results table { + border: none; +} +.overview_bar { + border: 1px solid black; + height: 1.4em; + margin: 0 -0.5px; +} +.overview_part { + float: left; + height: 1.4em; + margin: 0; + padding: 0; +} +.unrun { + background-color: #FFF3B4; +} + +.passed_tests, .unrun_tests, .failed_tests { + background-repeat: no-repeat; + margin: 0 4px; + padding-left: 22px; +} +.passed_tests { + background-image: url("../images/checkmark.png"); +} +.unrun_tests { + background-image: url("../images/exception.png"); +} +.failed_tests { + background-image: url("../images/wrong.png"); +} + +/** Virtual and import pages */ +.virtual header { + background-image: url("../images/virtualPage.jpg"); + background-position: center top; + background-repeat: no-repeat; +} +.imported header { + background-image: url("../images/importedPage.jpg"); + background-position: center top; + background-repeat: no-repeat; +} + +/** Test Execution report, backwards compatibility */ +.collapse_rim { + background: #F9F9F9; + border: 1px dotted #909090; +} +.collapse_rim > a { + padding-left: 16px; + background: url(../images/collapsibleClosed.png) no-repeat scroll 0 2px transparent; +} +.collapse_rim.open > a { + background: url(../images/collapsibleOpen.png) no-repeat scroll 0 2px transparent; +} + \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_straight.css b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_straight.css similarity index 93% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_straight.css rename to src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_straight.css index 7fa2967..a412a95 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_straight.css +++ b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_straight.css @@ -1,243 +1,243 @@ -body { - font:normal 80% Verdana, Helvetica, Arial, sans-serif; - padding: 0; - margin: 0 2em; -} -header, -footer, -article, -section, -aside, -nav { - display:block; -} -table { - border: 1px solid #EEEEEE; - border-collapse:collapse; -} -td, th { - border: thin solid #777777; - padding: 0.25em 0.5em; -} -header { - padding: 8px; - height: 90px; -} -#art_niche { - float: left; - margin-right: 1em; - background-image: url("../images/FitNesseLogo.png"); - width: 90px; - height: 90px; -} -#art_niche span { - display: none; -} -header ul { - margin: 0; - padding: 0; -} -header li { - display: inline; -} -header li+li:before { - content: "> "; -} -header h1 { - font: bold 2em; - margin: 0 0 0 102px; - font-weight: normal; - letter-spacing: 0.08em; - margin: 0 0 0 102px; - top: 25px; - position: absolute; -} -header h5 { - color: #aaaaaa; - font: bold 2em; - font-weight: normal; - letter-spacing: 0.08em; - margin: 0 0 0 105px; - top: 56px; - position: absolute; -} -header a, header a:active, header a:visited { - color:#800000 -} -header a:hover { - text-decoration:none; - color:#880000 -} -nav { - font-size: 0.9em; - border-bottom: 1px solid #800000; -} -nav ul { - float: right; - margin-top: -2.5em; -} -nav ul li { - display: block; - float: left; - list-style: none; - text-align:center; - z-index: 99; -} -nav a, nav a:active, nav a:visited { - color: #000000; - white-space: nowrap; - text-decoration: none; - width: 5em; - height: 1.5em; - color: black; - letter-spacing: 0.1em; - margin-right: 1em; - padding: 0.5em 3em; - background-color: #eeeeee; - border-radius: 0.25em; - border: 1pt solid #aaaaaa; -} -nav a:hover, nav a:active { - background-color: white; -} -nav ul ul { - background: #eeeeee; /* Adding a background makes the dropdown work properly in IE7+. */ - position: absolute; - display: none; - border: 1pt solid #aaaaaa; - z-index: 999; - width: 10em; - margin: 0.5em 0 0 0; - padding: .25em; - border-radius: 0.25em; -} -nav hr { - border: 1px solid black; - margin: 0; - -} -nav ul ul li { - float: none; - display: block; - line-height: 1.5em; - margin: 0; - text-align: left; -} -nav ul ul li.divider { - border-top: 1px solid #999999; -} -nav ul ul li a, -nav ul ul li a:active { - display: block; - border-radius: 0px; - padding: 0.5em; - height: 1.5em; - border: none; -} -nav ul ul li a:hover { - background-color: white; - width:9em; -} -nav ul ul li a:active { - background-color: #eee; -} -nav li:hover ul { - display: block; -} -article { - padding: 0.5em; -} -footer { - margin: 0; - padding: 0.5em; /* Use same color as border color for div.header. */ - border-top: 1px solid #800000; - font-size: 80%; - text-align: center; -} -footer a, header a:active, header a:visited { - color:#800000; -} -footer a:hover { - text-decoration:none; - color:#880000; -} - -/** Page content (article) styles **/ -h1+br, h2+br, h3+br, h4+br, h5+br, h6+br { - display: none; -} -article h1 { - font: bold 1.5em; -} -article a, header a:active, header a:visited { - color:#800000; -} -article a:hover { - text-decoration:none; - color:#880000; -} -th { - text-align: left; -} -article th { - white-space:nowrap; -} -.dirListing tbody tr:nth-child(odd) { - background: #fff -} -.dirListing tbody tr:nth-child(even) { - background: #efefef -} -#test-action .ok { - background-color: lightblue; -} -#test-action .output { - background-color: lightblue; -} - -@media print { - nav ul { - display: none; - } -} - -#error-nav { - position: fixed; - right: 0px; - top: 0px; - font-weight: bold; - border-width: 3px; - border-style: solid; - border-color: Black; - height: 60px; - width: 180px; - background-color: #FFAAAA ; -} - -#error-nav-label { - text-align: center; - line-height: 50%; -} - -#error-nav-controls { - text-align: center; -} - -#error-nav button{ - width: 30px; -} - -#error-nav input{ - width: 40px; -} - -.error-nav-hidden{ - visibility:hidden; -} - -.selected-error{ - border-style:solid; - border-width:4px; - border-color:SlateGray; -} - +body { + font:normal 80% Verdana, Helvetica, Arial, sans-serif; + padding: 0; + margin: 0 2em; +} +header, +footer, +article, +section, +aside, +nav { + display:block; +} +table { + border: 1px solid #EEEEEE; + border-collapse:collapse; +} +td, th { + border: thin solid #777777; + padding: 0.25em 0.5em; +} +header { + padding: 8px; + height: 90px; +} +#art_niche { + float: left; + margin-right: 1em; + background-image: url("../images/FitNesseLogo.png"); + width: 90px; + height: 90px; +} +#art_niche span { + display: none; +} +header ul { + margin: 0; + padding: 0; +} +header li { + display: inline; +} +header li+li:before { + content: "> "; +} +header h1 { + font: bold 2em; + margin: 0 0 0 102px; + font-weight: normal; + letter-spacing: 0.08em; + margin: 0 0 0 102px; + top: 25px; + position: absolute; +} +header h5 { + color: #aaaaaa; + font: bold 2em; + font-weight: normal; + letter-spacing: 0.08em; + margin: 0 0 0 105px; + top: 56px; + position: absolute; +} +header a, header a:active, header a:visited { + color:#800000 +} +header a:hover { + text-decoration:none; + color:#880000 +} +nav { + font-size: 0.9em; + border-bottom: 1px solid #800000; +} +nav ul { + float: right; + margin-top: -2.5em; +} +nav ul li { + display: block; + float: left; + list-style: none; + text-align:center; + z-index: 99; +} +nav a, nav a:active, nav a:visited { + color: #000000; + white-space: nowrap; + text-decoration: none; + width: 5em; + height: 1.5em; + color: black; + letter-spacing: 0.1em; + margin-right: 1em; + padding: 0.5em 3em; + background-color: #eeeeee; + border-radius: 0.25em; + border: 1pt solid #aaaaaa; +} +nav a:hover, nav a:active { + background-color: white; +} +nav ul ul { + background: #eeeeee; /* Adding a background makes the dropdown work properly in IE7+. */ + position: absolute; + display: none; + border: 1pt solid #aaaaaa; + z-index: 999; + width: 10em; + margin: 0.5em 0 0 0; + padding: .25em; + border-radius: 0.25em; +} +nav hr { + border: 1px solid black; + margin: 0; + +} +nav ul ul li { + float: none; + display: block; + line-height: 1.5em; + margin: 0; + text-align: left; +} +nav ul ul li.divider { + border-top: 1px solid #999999; +} +nav ul ul li a, +nav ul ul li a:active { + display: block; + border-radius: 0px; + padding: 0.5em; + height: 1.5em; + border: none; +} +nav ul ul li a:hover { + background-color: white; + width:9em; +} +nav ul ul li a:active { + background-color: #eee; +} +nav li:hover ul { + display: block; +} +article { + padding: 0.5em; +} +footer { + margin: 0; + padding: 0.5em; /* Use same color as border color for div.header. */ + border-top: 1px solid #800000; + font-size: 80%; + text-align: center; +} +footer a, header a:active, header a:visited { + color:#800000; +} +footer a:hover { + text-decoration:none; + color:#880000; +} + +/** Page content (article) styles **/ +h1+br, h2+br, h3+br, h4+br, h5+br, h6+br { + display: none; +} +article h1 { + font: bold 1.5em; +} +article a, header a:active, header a:visited { + color:#800000; +} +article a:hover { + text-decoration:none; + color:#880000; +} +th { + text-align: left; +} +article th { + white-space:nowrap; +} +.dirListing tbody tr:nth-child(odd) { + background: #fff +} +.dirListing tbody tr:nth-child(even) { + background: #efefef +} +#test-action .ok { + background-color: lightblue; +} +#test-action .output { + background-color: lightblue; +} + +@media print { + nav ul { + display: none; + } +} + +#error-nav { + position: fixed; + right: 0px; + top: 0px; + font-weight: bold; + border-width: 3px; + border-style: solid; + border-color: Black; + height: 60px; + width: 180px; + background-color: #FFAAAA ; +} + +#error-nav-label { + text-align: center; + line-height: 50%; +} + +#error-nav-controls { + text-align: center; +} + +#error-nav button{ + width: 30px; +} + +#error-nav input{ + width: 40px; +} + +.error-nav-hidden{ + visibility:hidden; +} + +.selected-error{ + border-style:solid; + border-width:4px; + border-color:SlateGray; +} + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_topnav.css b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_topnav.css similarity index 93% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_topnav.css rename to src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_topnav.css index 779d41e..ce5a792 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_topnav.css +++ b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_topnav.css @@ -1,302 +1,302 @@ -/* ****************** -Style colors: -Base: #DADFCA -DarkerBase: #969789 -DarkGray: #494A43 -Green: #CFE48A -DarkGreen: #474A2D -******************* */ - -/* BASIC CSS */ - -/* Makeshift CSS Reset */ -{ - margin: 0; - padding: 0; -} - -body { - margin: 0; - padding: 0; - font-family: 'Arial','Helvetica',sans-serif; - /*font-size: small;*/ - background:#979789; - color:black; -} -/* Tell the browser to render HTML 5 elements as block */ -header, footer, aside, nav, article { - display: block; -} - -img { - border:0; -} - -a, a:active, a:link, a:visited { - text-decoration: none; - color:darkgreen; -} - -h1, h2, h3, h4, h5, h6 { - color: #362F2D; - font-family: Helvetica,Arial; - font-weight: bold; - line-height: 1.1em; - padding-bottom: 5px; - font-size:xx-large; -} - -/* HEADER */ -header { - background:#94B73E; - padding:10px; - border-bottom: 2px solid #362F2D; -} - -header ul { - float:right; - list-style: none; - margin: 35px 0; - padding:0; -} - -header li { - font-size:large; - display: inline-block; -} - -header li a:visited { - color:black; -} - -header li:before { - content: "\0020 \0020 \0020 \00BB \0020"; - color: #111111; -} - -header h1 { - float:left - top:25px; - margin: 25px 5px 0 0; - font-size:xx-large; - color:#151515; -} - -header h1:visited{ - color:#151515; -} - -header h5 { - color: #151515; - margin: 0px 0px 0 0; - font-size: 10pt; -} - -#art_niche { - position:fixed; - top: 5px; - right:5px; - z-index: 1; - /*display:none; - background: url("../images/mint/fit.png") top left no-repeat; - width: 156px; - height: 49px;*/ -} - - -#art_niche span{ - color:#FFFFFF; - font-size:large; - font-weight:bold; - font-style:italic; -} - - - -/* NAVIGATION */ - -nav { - position: fixed; - top:0px; - left:0px; - background:#4C4C4C; - width:100%; - height:30px; - z-index:0; -} - -nav ul { - position: relative; - padding: 0px 0 5px 0; - margin:0; -} - -nav ul li { - display: block; - float: left; - list-style: none; - font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif; - background-color: #f5f5f5; - text-decoration:none; - font-weight:bold; - - height: 25px; - border: 2px solid #4C4C4C; - z-index: 99; -} - -nav a, nav a:link, nav a:active, nav a:visited { - white-space:nowrap; - text-decoration: none; - font-size:large; - color: #13110E; - padding: 0.2em .5em 0.2em .5em; -} - -nav ul ul { - background: #8B8B8B; /* Adding a background makes the dropdown work properly in IE7+. */ - position: absolute; - display: none; - z-index: 999; - margin: 0; -} - -nav .divider { - border-top: 1px solid #A8AC9C; -} - -nav ul ul li { - float: none; - display: block; - border: none; - line-height: 1.5em; - margin:0 7px 0 0; - background-color:#f5f5f5; - font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif; - text-decoration:none; - font-weight:bold; - color:#565656; - cursor:pointer; - padding:5px 10px 6px 7px; /* Links */ -} - -nav ul ul li a { - display: block; - padding:5px 0px 5px 0px; - border: none; -} - -nav ul ul li a:hover { - display: block; - border: none; - background-color: black; - color: white; -} - -nav li:hover ul { - display: block; -} - -/* ARTICLE */ - - - -article { - padding: 40px 40px 80px 40px; - background:#fff; - margin: 0 20px 0 20px; - -moz-box-shadow: 2px 2px 2px #494A43; --webkit-box-shadow: 2px 2px 2px #494A43; -box-shadow: 2px 2px 2px #494A43; - line-height:130%; - -} - -article br{ - display: block; - margin: 10px 0; -} - -table { - border: 1px solid darkgray ; - border-collapse:collapse; -} -td, th { - border: thin solid darkgray; - padding: 0.25em 0.5em; -} - - -/* FOOTER */ - -footer { - padding:20px; - color:white; -} - -footer a, footer a:active, footer a:link, footer a:visited { - text-decoration: none; - color:white; -} - -/* Test Actions */ - -#test-action .stop { - background-color: red; - color: white; - font-weight: bold; -} - -#test-action .ok { - background-color: darkgreen; -} -#test-action .output { - background-color: yellow; - color: black; -} -#test-action .error { - background-color: red; -} - - -#error-nav { - position: fixed; - right: 0px; - bottom: 0px; - font-weight: bold; - border-width: 3px; - border-style: solid; - border-color: Black; - height: 75px; - width: 180px; - background-color: #FFAAAA ; -} - -#error-nav-label { - text-align: center; - line-height: 50%; -} - -#error-nav-controls { - text-align: center; -} - -#error-nav button{ - width: 30px; -} - -#error-nav input{ - width: 40px; -} - -.error-nav-hidden{ - visibility:hidden; -} - -.selected-error{ - border-style:solid; - border-width:4px; - border-color:SlateGray; -} - - +/* ****************** +Style colors: +Base: #DADFCA +DarkerBase: #969789 +DarkGray: #494A43 +Green: #CFE48A +DarkGreen: #474A2D +******************* */ + +/* BASIC CSS */ + +/* Makeshift CSS Reset */ +{ + margin: 0; + padding: 0; +} + +body { + margin: 0; + padding: 0; + font-family: 'Arial','Helvetica',sans-serif; + /*font-size: small;*/ + background:#979789; + color:black; +} +/* Tell the browser to render HTML 5 elements as block */ +header, footer, aside, nav, article { + display: block; +} + +img { + border:0; +} + +a, a:active, a:link, a:visited { + text-decoration: none; + color:darkgreen; +} + +h1, h2, h3, h4, h5, h6 { + color: #362F2D; + font-family: Helvetica,Arial; + font-weight: bold; + line-height: 1.1em; + padding-bottom: 5px; + font-size:xx-large; +} + +/* HEADER */ +header { + background:#94B73E; + padding:10px; + border-bottom: 2px solid #362F2D; +} + +header ul { + float:right; + list-style: none; + margin: 35px 0; + padding:0; +} + +header li { + font-size:large; + display: inline-block; +} + +header li a:visited { + color:black; +} + +header li:before { + content: "\0020 \0020 \0020 \00BB \0020"; + color: #111111; +} + +header h1 { + float:left + top:25px; + margin: 25px 5px 0 0; + font-size:xx-large; + color:#151515; +} + +header h1:visited{ + color:#151515; +} + +header h5 { + color: #151515; + margin: 0px 0px 0 0; + font-size: 10pt; +} + +#art_niche { + position:fixed; + top: 5px; + right:5px; + z-index: 1; + /*display:none; + background: url("../images/mint/fit.png") top left no-repeat; + width: 156px; + height: 49px;*/ +} + + +#art_niche span{ + color:#FFFFFF; + font-size:large; + font-weight:bold; + font-style:italic; +} + + + +/* NAVIGATION */ + +nav { + position: fixed; + top:0px; + left:0px; + background:#4C4C4C; + width:100%; + height:30px; + z-index:0; +} + +nav ul { + position: relative; + padding: 0px 0 5px 0; + margin:0; +} + +nav ul li { + display: block; + float: left; + list-style: none; + font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif; + background-color: #f5f5f5; + text-decoration:none; + font-weight:bold; + + height: 25px; + border: 2px solid #4C4C4C; + z-index: 99; +} + +nav a, nav a:link, nav a:active, nav a:visited { + white-space:nowrap; + text-decoration: none; + font-size:large; + color: #13110E; + padding: 0.2em .5em 0.2em .5em; +} + +nav ul ul { + background: #8B8B8B; /* Adding a background makes the dropdown work properly in IE7+. */ + position: absolute; + display: none; + z-index: 999; + margin: 0; +} + +nav .divider { + border-top: 1px solid #A8AC9C; +} + +nav ul ul li { + float: none; + display: block; + border: none; + line-height: 1.5em; + margin:0 7px 0 0; + background-color:#f5f5f5; + font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif; + text-decoration:none; + font-weight:bold; + color:#565656; + cursor:pointer; + padding:5px 10px 6px 7px; /* Links */ +} + +nav ul ul li a { + display: block; + padding:5px 0px 5px 0px; + border: none; +} + +nav ul ul li a:hover { + display: block; + border: none; + background-color: black; + color: white; +} + +nav li:hover ul { + display: block; +} + +/* ARTICLE */ + + + +article { + padding: 40px 40px 80px 40px; + background:#fff; + margin: 0 20px 0 20px; + -moz-box-shadow: 2px 2px 2px #494A43; +-webkit-box-shadow: 2px 2px 2px #494A43; +box-shadow: 2px 2px 2px #494A43; + line-height:130%; + +} + +article br{ + display: block; + margin: 10px 0; +} + +table { + border: 1px solid darkgray ; + border-collapse:collapse; +} +td, th { + border: thin solid darkgray; + padding: 0.25em 0.5em; +} + + +/* FOOTER */ + +footer { + padding:20px; + color:white; +} + +footer a, footer a:active, footer a:link, footer a:visited { + text-decoration: none; + color:white; +} + +/* Test Actions */ + +#test-action .stop { + background-color: red; + color: white; + font-weight: bold; +} + +#test-action .ok { + background-color: darkgreen; +} +#test-action .output { + background-color: yellow; + color: black; +} +#test-action .error { + background-color: red; +} + + +#error-nav { + position: fixed; + right: 0px; + bottom: 0px; + font-weight: bold; + border-width: 3px; + border-style: solid; + border-color: Black; + height: 75px; + width: 180px; + background-color: #FFAAAA ; +} + +#error-nav-label { + text-align: center; + line-height: 50%; +} + +#error-nav-controls { + text-align: center; +} + +#error-nav button{ + width: 30px; +} + +#error-nav input{ + width: 40px; +} + +.error-nav-hidden{ + visibility:hidden; +} + +.selected-error{ + border-style:solid; + border-width:4px; + border-color:SlateGray; +} + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_wiki.css b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_wiki.css similarity index 93% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_wiki.css rename to src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_wiki.css index bdf9644..00c0435 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/css/fitnesse_wiki.css +++ b/src/test/resources/fitnesse-target/fitnesse/resources/css/fitnesse_wiki.css @@ -1,237 +1,237 @@ -/* Wiki styling */ - - -article .centered { - margin: 5px; - text-align: center; -} - -.strike { - text-decoration: line-through; -} - -.italic { - font-style:italic; -} - -.code { - font-family: courier, 'Lucida Sans Typewriter', monospace; - color: #004000; - font-weight: bold; -} - -.meta { - color: #BF8660; - font-style: italic; -} - -.note { - font-size: 85%; -} - -/** Collapsable section */ -.collapsible { - background: #F9F9F9; - margin: 5px 0px 5px 0px; - padding: 2px 2px 2px 2px; - border: 1px dotted #909090; -} - -.collapsible { - border-color: #BF8660; -} - -.collapsible > div { - margin-left: 16px; -} - -.collapsible.closed > div { - display: none; -} - -.collapsible.invisible { - display: none; -} - -.collapsible p.title { - color: #BF8660; - font-style: italic; - margin: 0; - padding: 0 0 0 16px; -} - -.collapsible p.title { - background: url(../images/collapsibleOpen.png) no-repeat scroll 0 2px transparent; -} - -.collapsible.closed p.title { - background: url(../images/collapsibleClosed.png) no-repeat scroll 0 2px transparent; -} - -.collapsible > ul { - float: right; - margin: 0; -} - -.collapsible > ul li { - display: inline; - padding: 0 .5em; - border-left: 1px solid #BF8660; -} - -table { - border: 1px solid #EEEEEE; - border-collapse:collapse; -} -td, th { - border: thin solid #777777; - padding: 0.25em 0.5em; -} -table.plain_text_table { - border-top: none; - border-right: none; - border-bottom: none; - border-left: 2px solid #e5e5e5; - margin-left: 1em; -} -table.plain_text_table td, -table.plain_text_table th { - border: none; -} - -/** !style_* */ -.error { - background-color: #ffffaa; -} -.pass { - background-color: #AAFFAA; -} -.fail { - background-color: #FFAAAA; -} -.ignore { - background-color: lightgray; -} -.caps { - font-variant: small-caps; -} -.red { - color: red; -} -.orange { - color: orange; -} -.yellow { - color: yellow; -} -.green { - color: green; -} -.blue { - color: blue; -} -.indigo { - color: indigo; -} -.violet { - color: violet; -} -.pink { - color: pink; -} -.lightYellow { - color: lightYellow; -} -.lightGreen { - color: lightGreen; -} -.lightBlue { - color: lightBlue; -} -.chocolate { - color: chocolate; -} -.darkOrange { - color: darkOrange; -} -.darkRed { - color: darkRed; -} -.olive { - color: olive; -} -.darkBlue { - color: darkBlue; -} -.darkGreen { - color: darkGreen; -} -.right { - float: right; -} -.left { - float: left; -} -.pageHelp { - font-size: 0.7em; - font-style: italic; - margin-left: 1.5em; -} -.hidden { - display: none; -} -.fit_stacktrace { - font-size: 0.7em; -} -.fit_label { - font-style: italic; - color: #C08080; -} -.fit_grey { - color: #808080; -} - -.fit_extension {border: solid 1px grey;} -.fit_table {border: solid 1px grey; border-collapse: collapse; margin: 2px 0px;} -table.fit_table tr td {border: solid 1px grey; padding: 2px 2px 2px 2px;} -.fit_interpreter {font-style: italic; color: #808020;} -.fit_keyword {color: #1010A0;} -.fit_member {color: #208080;} -.fit_SUT {color: #808020;} - -/* Diff styling */ - -table.diff_table tr td {border: 0px; padding: 0px 0px 0px 0px;} - -.diff_table { - margin: 0px; - padding: 0px; - border: 1px; - border-spacing: 0px; - font-family: monospace; - font-size: 125%; -} - -.diff_line { - padding-bottom: 0px; - padding-top: 0px; - white-space: pre; - background: #D6D0D2; -} - -.diff_chunk_header { - background: #C0C0C0; - font-weight: bold; -} - -.diff_line_added { - background: #B3FCC1; - color: #000000; - font-weight: bold; -} - -.diff_line_removed { - background: #FFCBDB; - color: #CC5478; - font-weight: bold; -} +/* Wiki styling */ + + +article .centered { + margin: 5px; + text-align: center; +} + +.strike { + text-decoration: line-through; +} + +.italic { + font-style:italic; +} + +.code { + font-family: courier, 'Lucida Sans Typewriter', monospace; + color: #004000; + font-weight: bold; +} + +.meta { + color: #BF8660; + font-style: italic; +} + +.note { + font-size: 85%; +} + +/** Collapsable section */ +.collapsible { + background: #F9F9F9; + margin: 5px 0px 5px 0px; + padding: 2px 2px 2px 2px; + border: 1px dotted #909090; +} + +.collapsible { + border-color: #BF8660; +} + +.collapsible > div { + margin-left: 16px; +} + +.collapsible.closed > div { + display: none; +} + +.collapsible.invisible { + display: none; +} + +.collapsible p.title { + color: #BF8660; + font-style: italic; + margin: 0; + padding: 0 0 0 16px; +} + +.collapsible p.title { + background: url(../images/collapsibleOpen.png) no-repeat scroll 0 2px transparent; +} + +.collapsible.closed p.title { + background: url(../images/collapsibleClosed.png) no-repeat scroll 0 2px transparent; +} + +.collapsible > ul { + float: right; + margin: 0; +} + +.collapsible > ul li { + display: inline; + padding: 0 .5em; + border-left: 1px solid #BF8660; +} + +table { + border: 1px solid #EEEEEE; + border-collapse:collapse; +} +td, th { + border: thin solid #777777; + padding: 0.25em 0.5em; +} +table.plain_text_table { + border-top: none; + border-right: none; + border-bottom: none; + border-left: 2px solid #e5e5e5; + margin-left: 1em; +} +table.plain_text_table td, +table.plain_text_table th { + border: none; +} + +/** !style_* */ +.error { + background-color: #ffffaa; +} +.pass { + background-color: #AAFFAA; +} +.fail { + background-color: #FFAAAA; +} +.ignore { + background-color: lightgray; +} +.caps { + font-variant: small-caps; +} +.red { + color: red; +} +.orange { + color: orange; +} +.yellow { + color: yellow; +} +.green { + color: green; +} +.blue { + color: blue; +} +.indigo { + color: indigo; +} +.violet { + color: violet; +} +.pink { + color: pink; +} +.lightYellow { + color: lightYellow; +} +.lightGreen { + color: lightGreen; +} +.lightBlue { + color: lightBlue; +} +.chocolate { + color: chocolate; +} +.darkOrange { + color: darkOrange; +} +.darkRed { + color: darkRed; +} +.olive { + color: olive; +} +.darkBlue { + color: darkBlue; +} +.darkGreen { + color: darkGreen; +} +.right { + float: right; +} +.left { + float: left; +} +.pageHelp { + font-size: 0.7em; + font-style: italic; + margin-left: 1.5em; +} +.hidden { + display: none; +} +.fit_stacktrace { + font-size: 0.7em; +} +.fit_label { + font-style: italic; + color: #C08080; +} +.fit_grey { + color: #808080; +} + +.fit_extension {border: solid 1px grey;} +.fit_table {border: solid 1px grey; border-collapse: collapse; margin: 2px 0px;} +table.fit_table tr td {border: solid 1px grey; padding: 2px 2px 2px 2px;} +.fit_interpreter {font-style: italic; color: #808020;} +.fit_keyword {color: #1010A0;} +.fit_member {color: #208080;} +.fit_SUT {color: #808020;} + +/* Diff styling */ + +table.diff_table tr td {border: 0px; padding: 0px 0px 0px 0px;} + +.diff_table { + margin: 0px; + padding: 0px; + border: 1px; + border-spacing: 0px; + font-family: monospace; + font-size: 125%; +} + +.diff_line { + padding-bottom: 0px; + padding-top: 0px; + white-space: pre; + background: #D6D0D2; +} + +.diff_chunk_header { + background: #C0C0C0; + font-weight: bold; +} + +.diff_line_added { + background: #B3FCC1; + color: #000000; + font-weight: bold; +} + +.diff_line_removed { + background: #FFCBDB; + color: #CC5478; + font-weight: bold; +} diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/FitNesseLogo.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/FitNesseLogo.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/FitNesseLogo.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/FitNesseLogo.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/FitNesseLogo.psd b/src/test/resources/fitnesse-target/fitnesse/resources/images/FitNesseLogo.psd similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/FitNesseLogo.psd rename to src/test/resources/fitnesse-target/fitnesse/resources/images/FitNesseLogo.psd diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/FitNesseLogo2.psd b/src/test/resources/fitnesse-target/fitnesse/resources/images/FitNesseLogo2.psd similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/FitNesseLogo2.psd rename to src/test/resources/fitnesse-target/fitnesse/resources/images/FitNesseLogo2.psd diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/checkmark.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/checkmark.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/checkmark.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/checkmark.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/collapsibleClosed.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/collapsibleClosed.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/collapsibleClosed.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/collapsibleClosed.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/collapsibleHidden.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/collapsibleHidden.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/collapsibleHidden.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/collapsibleHidden.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/collapsibleOpen.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/collapsibleOpen.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/collapsibleOpen.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/collapsibleOpen.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/exception.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/exception.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/exception.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/exception.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/executionStatus/error.gif b/src/test/resources/fitnesse-target/fitnesse/resources/images/executionStatus/error.gif similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/executionStatus/error.gif rename to src/test/resources/fitnesse-target/fitnesse/resources/images/executionStatus/error.gif diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/executionStatus/ok.gif b/src/test/resources/fitnesse-target/fitnesse/resources/images/executionStatus/ok.gif similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/executionStatus/ok.gif rename to src/test/resources/fitnesse-target/fitnesse/resources/images/executionStatus/ok.gif diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/executionStatus/output.gif b/src/test/resources/fitnesse-target/fitnesse/resources/images/executionStatus/output.gif similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/executionStatus/output.gif rename to src/test/resources/fitnesse-target/fitnesse/resources/images/executionStatus/output.gif diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/fail.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/fail.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/fail.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/fail.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/favicon.ico b/src/test/resources/fitnesse-target/fitnesse/resources/images/favicon.ico similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/favicon.ico rename to src/test/resources/fitnesse-target/fitnesse/resources/images/favicon.ico diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/fit_mint.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/fit_mint.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/fit_mint.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/fit_mint.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/fitnesse_architecture.jpg b/src/test/resources/fitnesse-target/fitnesse/resources/images/fitnesse_architecture.jpg similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/fitnesse_architecture.jpg rename to src/test/resources/fitnesse-target/fitnesse/resources/images/fitnesse_architecture.jpg diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/folder.gif b/src/test/resources/fitnesse-target/fitnesse/resources/images/folder.gif similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/folder.gif rename to src/test/resources/fitnesse-target/fitnesse/resources/images/folder.gif diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/importedPage.jpg b/src/test/resources/fitnesse-target/fitnesse/resources/images/importedPage.jpg similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/importedPage.jpg rename to src/test/resources/fitnesse-target/fitnesse/resources/images/importedPage.jpg diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/pass.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/pass.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/pass.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/pass.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/symlinkDiagram.gif b/src/test/resources/fitnesse-target/fitnesse/resources/images/symlinkDiagram.gif similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/symlinkDiagram.gif rename to src/test/resources/fitnesse-target/fitnesse/resources/images/symlinkDiagram.gif diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/unrun.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/unrun.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/unrun.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/unrun.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/virtualPage.jpg b/src/test/resources/fitnesse-target/fitnesse/resources/images/virtualPage.jpg similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/virtualPage.jpg rename to src/test/resources/fitnesse-target/fitnesse/resources/images/virtualPage.jpg diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/images/wrong.png b/src/test/resources/fitnesse-target/fitnesse/resources/images/wrong.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/images/wrong.png rename to src/test/resources/fitnesse-target/fitnesse/resources/images/wrong.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/AllTests.html b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/AllTests.html similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/AllTests.html rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/AllTests.html index 0b27edf..128110a 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/AllTests.html +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/AllTests.html @@ -1,26 +1,26 @@ - - - - - - - All Tests - - - - - - - + + + + + + + All Tests + + + + + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/ClientSideSortTest.html b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/ClientSideSortTest.html similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/ClientSideSortTest.html rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/ClientSideSortTest.html index 6d37f80..660ee45 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/ClientSideSortTest.html +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/ClientSideSortTest.html @@ -1,235 +1,235 @@ - - - - - - -Client Side Sort Test - - - - - - - + + + + + + +Client Side Sort Test + + + + + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/CollapsableWidgetTest.html b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/CollapsableWidgetTest.html similarity index 95% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/CollapsableWidgetTest.html rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/CollapsableWidgetTest.html index f471d03..5298e5b 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/CollapsableWidgetTest.html +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/CollapsableWidgetTest.html @@ -1,120 +1,120 @@ - - - - - - - CollapsableWidget Test - - - - - - - - + + + + + + + CollapsableWidget Test + + + + + + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/SpreadsheetTranslator.js b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/SpreadsheetTranslator.js similarity index 95% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/SpreadsheetTranslator.js rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/SpreadsheetTranslator.js index 3bef96e..d1abd36 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/SpreadsheetTranslator.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/SpreadsheetTranslator.js @@ -1,154 +1,154 @@ -// Copyright (C) 2004 by Alain Bienvenue. All rights reserved. -// Released under the terms of the GNU General Public License version 2 or later. - -function SpreadsheetTranslator() -{ - this.currentLine; - this.rows; - this.fitNesseTables; - - this.isImplicitTableStart = function(index) - { - if (this.rows[index][0].match("^[A-Za-z][0-9A-Za-z]*\\.[A-Za-z][0-9A-Za-z]*")) - { - return true; - } - var i; - for (i = index; i < this.rows.length; i++) - { - if ((this.rows[i][0] == '!') || this.lineSize(this.rows[i]) == 0) - { - return false; - } - if (this.lineSize(this.rows[i]) > 1) - { - return true; - } - } - return false; - } - - this.isExplicitTableStart = function(rows, index) - { - return (rows[index][0] == "!"); - } - - this.isNotTableLine = function(currentLine, columnsToSkip) - { - var row = this.rows[currentLine]; - if (this.lineSize(row) == 0) - { - return true; - } - - var i; - for (i = 0; i < columnsToSkip; i++) - { - if (row[i] != '') - { - return true; - } - } - return false; - } - - this.lineSize = function(row) - { - var x; - for (x = row.length - 1; x >= 0; x--) - { - if (row[x] != '') return x + 1; - } - return 0; - } - - this.parseExcelTable = function(excelTable) - { - var table = this.removeCarriageReturns(excelTable); - var lines = table.split("\n"); - this.rows = new Array; - for (i = 0; i < lines.length; i++) - { - this.rows[i] = lines[i].split("\t"); - } - } - - - this.removeCarriageReturns = function(str) - { - return str.replace(/\r\n/g, '\n').replace(/\r/g, '\n'); - } - - this.getFitNesseTables = function() - { - this.currentLine = 0; - this.fitNesseTables = new String(); - while (this.currentLine < this.rows.length) - { - if (this.isExplicitTableStart(this.rows, this.currentLine)) - { - this.processTable(1); - } - else if (this.isImplicitTableStart(this.currentLine)) - { - if (this.rows[this.currentLine][0] == '') - { - this.processTable(1); - } - else - { - this.processTable(0); - } - } - else - { - this.fitNesseTables += "\n" + this.rows[this.currentLine][0]; - } - this.currentLine++; - } - return this.fitNesseTables.substring(1); - } - - - this.processTable = function(columnsToSkip) - { - var tableFirstLine = this.currentLine; - var tableSize; - - while (this.currentLine < this.rows.length) - { - var row = this.rows[this.currentLine]; - if (this.currentLine > tableFirstLine && this.isNotTableLine(this.currentLine, columnsToSkip)) - { - this.currentLine--; - return; - } - - this.fitNesseTables += "\n"; - var lineSize = 0; - if (this.currentLine == tableFirstLine) - { - this.fitNesseTables += "!"; - lineSize = this.lineSize(row); - } - else if (this.currentLine == tableFirstLine + 1) - { - lineSize = this.lineSize(row); - tableSize = lineSize; - } - else - { - lineSize = Math.max(tableSize, this.lineSize(row)); - lineSize = Math.min(lineSize, row.length); - } - - this.fitNesseTables += "|"; - var j; - for (j = columnsToSkip; j < lineSize; j++) - { - this.fitNesseTables += row[j] + "|"; - } - this.currentLine++; - } - } -} +// Copyright (C) 2004 by Alain Bienvenue. All rights reserved. +// Released under the terms of the GNU General Public License version 2 or later. + +function SpreadsheetTranslator() +{ + this.currentLine; + this.rows; + this.fitNesseTables; + + this.isImplicitTableStart = function(index) + { + if (this.rows[index][0].match("^[A-Za-z][0-9A-Za-z]*\\.[A-Za-z][0-9A-Za-z]*")) + { + return true; + } + var i; + for (i = index; i < this.rows.length; i++) + { + if ((this.rows[i][0] == '!') || this.lineSize(this.rows[i]) == 0) + { + return false; + } + if (this.lineSize(this.rows[i]) > 1) + { + return true; + } + } + return false; + } + + this.isExplicitTableStart = function(rows, index) + { + return (rows[index][0] == "!"); + } + + this.isNotTableLine = function(currentLine, columnsToSkip) + { + var row = this.rows[currentLine]; + if (this.lineSize(row) == 0) + { + return true; + } + + var i; + for (i = 0; i < columnsToSkip; i++) + { + if (row[i] != '') + { + return true; + } + } + return false; + } + + this.lineSize = function(row) + { + var x; + for (x = row.length - 1; x >= 0; x--) + { + if (row[x] != '') return x + 1; + } + return 0; + } + + this.parseExcelTable = function(excelTable) + { + var table = this.removeCarriageReturns(excelTable); + var lines = table.split("\n"); + this.rows = new Array; + for (i = 0; i < lines.length; i++) + { + this.rows[i] = lines[i].split("\t"); + } + } + + + this.removeCarriageReturns = function(str) + { + return str.replace(/\r\n/g, '\n').replace(/\r/g, '\n'); + } + + this.getFitNesseTables = function() + { + this.currentLine = 0; + this.fitNesseTables = new String(); + while (this.currentLine < this.rows.length) + { + if (this.isExplicitTableStart(this.rows, this.currentLine)) + { + this.processTable(1); + } + else if (this.isImplicitTableStart(this.currentLine)) + { + if (this.rows[this.currentLine][0] == '') + { + this.processTable(1); + } + else + { + this.processTable(0); + } + } + else + { + this.fitNesseTables += "\n" + this.rows[this.currentLine][0]; + } + this.currentLine++; + } + return this.fitNesseTables.substring(1); + } + + + this.processTable = function(columnsToSkip) + { + var tableFirstLine = this.currentLine; + var tableSize; + + while (this.currentLine < this.rows.length) + { + var row = this.rows[this.currentLine]; + if (this.currentLine > tableFirstLine && this.isNotTableLine(this.currentLine, columnsToSkip)) + { + this.currentLine--; + return; + } + + this.fitNesseTables += "\n"; + var lineSize = 0; + if (this.currentLine == tableFirstLine) + { + this.fitNesseTables += "!"; + lineSize = this.lineSize(row); + } + else if (this.currentLine == tableFirstLine + 1) + { + lineSize = this.lineSize(row); + tableSize = lineSize; + } + else + { + lineSize = Math.max(tableSize, this.lineSize(row)); + lineSize = Math.min(lineSize, row.length); + } + + this.fitNesseTables += "|"; + var j; + for (j = columnsToSkip; j < lineSize; j++) + { + this.fitNesseTables += row[j] + "|"; + } + this.currentLine++; + } + } +} diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/SpreadsheetTranslatorTest.html b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/SpreadsheetTranslatorTest.html similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/SpreadsheetTranslatorTest.html rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/SpreadsheetTranslatorTest.html index baa2a57..457ab5d 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/SpreadsheetTranslatorTest.html +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/SpreadsheetTranslatorTest.html @@ -1,231 +1,231 @@ - - - - - - - SpreadsheetTranslator Test - - - - - - - - - + + + + + + + SpreadsheetTranslator Test + + + + + + + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/TemplateInserter.js b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/TemplateInserter.js similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/TemplateInserter.js rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/TemplateInserter.js index 2a1e1f1..8383606 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/TemplateInserter.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/TemplateInserter.js @@ -1,20 +1,20 @@ -function TemplateInserter() -{ - this.insertInto = function(templateValue, textArea) { - - if(templateValue !== "") - { - var pageDataUrl = templateValue.substr(1, templateValue.length - 1) + "?pageData"; - - $.ajax({ - url: pageDataUrl, - success: function(result) { - $('#pageContent').replaceSelectedText(result); - }, - error: function() { - alert("Error Accessing Template"); - } - }); - } - }; +function TemplateInserter() +{ + this.insertInto = function(templateValue, textArea) { + + if(templateValue !== "") + { + var pageDataUrl = templateValue.substr(1, templateValue.length - 1) + "?pageData"; + + $.ajax({ + url: pageDataUrl, + success: function(result) { + $('#pageContent').replaceSelectedText(result); + }, + error: function() { + alert("Error Accessing Template"); + } + }); + } + }; } \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/WikiFormatter.js b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/WikiFormatter.js similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/WikiFormatter.js rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/WikiFormatter.js index d47f508..b1f46c2 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/WikiFormatter.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/WikiFormatter.js @@ -1,324 +1,324 @@ -function WikiFormatter() -{ - /* - * This is the entry point, it takes a chunk of text, splits it into lines, loops - * through the lines collecting consecutive lines that are part of a table, and returns - * a chunk of text with those tables it collected formatted. - */ - this.format = function(wikiText) { - this.wikificationPrevention = false; - - var formatted = ""; - var currentTable = []; - var lines = wikiText.split("\n"); - var line = null; - - for(var i = 0, j = lines.length; i < j; i++) { - line = lines[i]; - - if(this.isTableRow(line)) { - currentTable.push(line); - } - else { - formatted += this.formatTable(currentTable); - currentTable = []; - formatted += line + "\n"; - } - } - - formatted += this.formatTable(currentTable); - return formatted.slice(0, formatted.length - 1); - }; - - /* - * This function receives an array of strings(rows), it splits each of those strings - * into an array of strings(columns), calls off to calculate what the widths - * of each of those columns should be and then returns a string with each column - * right/space padded based on the calculated widths. - */ - this.formatTable = function(table) { - var formatted = ""; - var splitRowsResult = this.splitRows(table); - var rows = splitRowsResult.rows; - var suffixes = splitRowsResult.suffixes; - var widths = this.calculateColumnWidths(rows); - var row = null; - - for(var rowIndex = 0, numberOfRows = rows.length; rowIndex < numberOfRows; rowIndex++) { - row = rows[rowIndex]; - formatted += "|"; - - for(var columnIndex = 0, numberOfColumns = row.length; columnIndex < numberOfColumns; columnIndex++) { - formatted += this.rightPad(row[columnIndex], widths[rowIndex][columnIndex]) + "|"; - } - - formatted += suffixes[rowIndex] + "\n"; - } - - if(this.wikificationPrevention) { - formatted = '!|' + formatted.substr(2); - this.wikificationPrevention = false; - } - - return formatted; - }; - - /* - * This is where the nastiness starts due to trying to emulate - * the html rendering of colspans. - * - make a row/column matrix that contains data lengths - * - find the max widths of those columns that don't have colspans - * - update the matrix to set each non colspan column to those max widths - * - find the max widths of the colspan columns - * - increase the non colspan columns if the colspan columns lengths are greater - * - adjust colspan columns to pad out to the max length of the row - * - * Feel free to refator as necessary for clarity - */ - this.calculateColumnWidths = function(rows) { - var widths = this.getRealColumnWidths(rows); - var totalNumberOfColumns = this.getNumberOfColumns(rows); - - var maxWidths = this.getMaxWidths(widths, totalNumberOfColumns); - this.setMaxWidthsOnNonColspanColumns(widths, maxWidths); - - var colspanWidths = this.getColspanWidth(widths, totalNumberOfColumns); - this.adjustWidthsForColspans(widths, maxWidths, colspanWidths); - - this.adjustColspansForWidths(widths, maxWidths); - - return widths; - }; - - this.isTableRow = function(line) { - return line.match(/^!?\|/); - }; - - this.splitRows = function(rows) { - var splitRows = []; - var rowSuffixes = []; - - this.each(rows, function(row) { - var columns = this.splitRow(row); - rowSuffixes.push(columns[columns.length - 1]); - splitRows.push(columns.slice(0, columns.length - 1)); - }, this); - - return {rows: splitRows, suffixes: rowSuffixes}; - }; - - this.splitRow = function(row) { - var replacement = '__TEMP_PIPE_CHARACTER__'; - if (row.match(/!-/)){ - row = this.replacePipesInLiteralsWithPlaceholder(row,replacement ); - } - var columns = this.trim(row).split('|'); - - if(!this.wikificationPrevention && columns[0] == '!') { - this.wikificationPrevention = true; - columns[1] = '!' + columns[1]; //leave a placeholder - } - - columns = columns.slice(1, columns.length); - - this.each(columns, function(column, i) { - columns[i] = this.trim(column).replace(/__TEMP_PIPE_CHARACTER__/g, '|'); - }, this); - - return columns; - }; - - this.replacePipesInLiteralsWithPlaceholder = function(text, rep){ - var newText = ""; - - while(text.match(/!-/)){ - var textParts = this.splitLiteral(text); - newText = newText + textParts.left + textParts.literal.replace(/\|/g, rep); - text = textParts.right; - } - - return newText + text; - }; - - - this.splitLiteral = function(text){ - var leftText = ""; - var rightText = ""; - var literalText = ""; - - var matchOpenLiteral = text.match(/(.*?)(!-.*)/); - leftText = matchOpenLiteral[1]; - if (matchOpenLiteral[2].match(/-!/)){ - var matchCloseLiteral = matchOpenLiteral[2].match(/(.*?-!)(.*)/); - literalText = matchCloseLiteral[1]; - rightText = matchCloseLiteral[2]; - } - else { - literalText = matchOpenLiteral[2]; - rightText = ""; - } - - return {left:leftText, literal:literalText, right:rightText}; - - }; - - - this.getRealColumnWidths = function(rows) { - var widths = []; - - this.each(rows, function(row, rowIndex) { - widths.push([]); - - this.each(row, function(column, columnIndex) { - widths[rowIndex][columnIndex] = column.length; - }, this); - }, this); - - return widths; - }; - - this.getMaxWidths = function(widths, totalNumberOfColumns) { - var maxWidths = []; - var row = null; - - this.each(widths, function(row, rowIndex) { - this.each(row, function(columnWidth, columnIndex) { - if(columnIndex == (row.length - 1) && row.length < totalNumberOfColumns) { - return false; - } - - if(columnIndex >= maxWidths.length) { - maxWidths.push(columnWidth); - } - else if(columnWidth > maxWidths[columnIndex]) { - maxWidths[columnIndex] = columnWidth; - } - }, this); - }, this); - - return maxWidths; - }; - - this.getNumberOfColumns = function(rows) { - var numberOfColumns = 0; - - this.each(rows, function(row) { - if(row.length > numberOfColumns) { - numberOfColumns = row.length; - } - }); - - return numberOfColumns; - }; - - this.getColspanWidth = function(widths, totalNumberOfColumns) { - var colspanWidths = []; - var colspan = null; - var colspanWidth = null; - - this.each(widths, function(row, rowIndex) { - if(row.length < totalNumberOfColumns) { - colspan = totalNumberOfColumns - row.length; - colspanWidth = row[row.length - 1]; - - if(colspan >= colspanWidths.length) { - colspanWidths[colspan] = colspanWidth; - } - else if(!colspanWidths[colspan] || colspanWidth > colspanWidths[colspan]) { - colspanWidths[colspan] = colspanWidth; - } - } - }); - - return colspanWidths; - }; - - this.setMaxWidthsOnNonColspanColumns = function(widths, maxWidths) { - this.each(widths, function(row, rowIndex) { - this.each(row, function(columnWidth, columnIndex) { - if(columnIndex == (row.length - 1) && row.length < maxWidths.length) { - return false; - } - - row[columnIndex] = maxWidths[columnIndex]; - }, this); - }, this); - }; - - this.getWidthOfLastNumberOfColumns = function(maxWidths, numberOfColumns) { - var width = 0; - - for(var i = 1; i <= numberOfColumns; i++) { - width += maxWidths[maxWidths.length - i]; - } - - return width + numberOfColumns - 1; //add in length of separators - }; - - this.spreadOutExcessOverLastNumberOfColumns = function(maxWidths, excess, numberOfColumns){ - var columnToApplyExcessTo = maxWidths.length - numberOfColumns; - - for(var i = 0; i < excess; i++) { - maxWidths[columnToApplyExcessTo++] += 1; - - if(columnToApplyExcessTo == maxWidths.length) { - columnToApplyExcessTo = maxWidths.length - numberOfColumns; - } - } - }; - - this.adjustWidthsForColspans = function(widths, maxWidths, colspanWidths) { - var lastNumberOfColumnsWidth = null; - var excess = null; - - this.each(colspanWidths, function(colspanWidth, index) { - lastNumberOfColumnsWidth = this.getWidthOfLastNumberOfColumns(maxWidths, index + 1); - - if(colspanWidth && colspanWidth > lastNumberOfColumnsWidth){ - excess = colspanWidth - lastNumberOfColumnsWidth; - this.spreadOutExcessOverLastNumberOfColumns(maxWidths, excess, index + 1); - this.setMaxWidthsOnNonColspanColumns(widths, maxWidths); - } - }, this); - }; - - this.adjustColspansForWidths = function(widths, maxWidths) { - var colspan = null; - var lastNumberOfColumnsWidth = null - - this.each(widths, function(row, rowIndex) { - colspan = maxWidths.length - row.length + 1; - - if(colspan > 1) { - row[row.length - 1] = this.getWidthOfLastNumberOfColumns(maxWidths, colspan); - } - }, this); - }; - - /* - * Utility functions - */ - this.trim = function(text) { - return (text || "").replace( /^\s+|\s+$/g, "" ); - }; - - this.each = function(array, callback, context) { - var index = 0; - var length = array.length; - - while(index < length && callback.call(context, array[index], index) !== false) { - index++; - } - }, - - this.rightPad = function(value, length) { - var padded = value; - - for(var i = 0, j = length - value.length; i < j; i++) { - padded += " "; - } - - return padded; - }; - -} +function WikiFormatter() +{ + /* + * This is the entry point, it takes a chunk of text, splits it into lines, loops + * through the lines collecting consecutive lines that are part of a table, and returns + * a chunk of text with those tables it collected formatted. + */ + this.format = function(wikiText) { + this.wikificationPrevention = false; + + var formatted = ""; + var currentTable = []; + var lines = wikiText.split("\n"); + var line = null; + + for(var i = 0, j = lines.length; i < j; i++) { + line = lines[i]; + + if(this.isTableRow(line)) { + currentTable.push(line); + } + else { + formatted += this.formatTable(currentTable); + currentTable = []; + formatted += line + "\n"; + } + } + + formatted += this.formatTable(currentTable); + return formatted.slice(0, formatted.length - 1); + }; + + /* + * This function receives an array of strings(rows), it splits each of those strings + * into an array of strings(columns), calls off to calculate what the widths + * of each of those columns should be and then returns a string with each column + * right/space padded based on the calculated widths. + */ + this.formatTable = function(table) { + var formatted = ""; + var splitRowsResult = this.splitRows(table); + var rows = splitRowsResult.rows; + var suffixes = splitRowsResult.suffixes; + var widths = this.calculateColumnWidths(rows); + var row = null; + + for(var rowIndex = 0, numberOfRows = rows.length; rowIndex < numberOfRows; rowIndex++) { + row = rows[rowIndex]; + formatted += "|"; + + for(var columnIndex = 0, numberOfColumns = row.length; columnIndex < numberOfColumns; columnIndex++) { + formatted += this.rightPad(row[columnIndex], widths[rowIndex][columnIndex]) + "|"; + } + + formatted += suffixes[rowIndex] + "\n"; + } + + if(this.wikificationPrevention) { + formatted = '!|' + formatted.substr(2); + this.wikificationPrevention = false; + } + + return formatted; + }; + + /* + * This is where the nastiness starts due to trying to emulate + * the html rendering of colspans. + * - make a row/column matrix that contains data lengths + * - find the max widths of those columns that don't have colspans + * - update the matrix to set each non colspan column to those max widths + * - find the max widths of the colspan columns + * - increase the non colspan columns if the colspan columns lengths are greater + * - adjust colspan columns to pad out to the max length of the row + * + * Feel free to refator as necessary for clarity + */ + this.calculateColumnWidths = function(rows) { + var widths = this.getRealColumnWidths(rows); + var totalNumberOfColumns = this.getNumberOfColumns(rows); + + var maxWidths = this.getMaxWidths(widths, totalNumberOfColumns); + this.setMaxWidthsOnNonColspanColumns(widths, maxWidths); + + var colspanWidths = this.getColspanWidth(widths, totalNumberOfColumns); + this.adjustWidthsForColspans(widths, maxWidths, colspanWidths); + + this.adjustColspansForWidths(widths, maxWidths); + + return widths; + }; + + this.isTableRow = function(line) { + return line.match(/^!?\|/); + }; + + this.splitRows = function(rows) { + var splitRows = []; + var rowSuffixes = []; + + this.each(rows, function(row) { + var columns = this.splitRow(row); + rowSuffixes.push(columns[columns.length - 1]); + splitRows.push(columns.slice(0, columns.length - 1)); + }, this); + + return {rows: splitRows, suffixes: rowSuffixes}; + }; + + this.splitRow = function(row) { + var replacement = '__TEMP_PIPE_CHARACTER__'; + if (row.match(/!-/)){ + row = this.replacePipesInLiteralsWithPlaceholder(row,replacement ); + } + var columns = this.trim(row).split('|'); + + if(!this.wikificationPrevention && columns[0] == '!') { + this.wikificationPrevention = true; + columns[1] = '!' + columns[1]; //leave a placeholder + } + + columns = columns.slice(1, columns.length); + + this.each(columns, function(column, i) { + columns[i] = this.trim(column).replace(/__TEMP_PIPE_CHARACTER__/g, '|'); + }, this); + + return columns; + }; + + this.replacePipesInLiteralsWithPlaceholder = function(text, rep){ + var newText = ""; + + while(text.match(/!-/)){ + var textParts = this.splitLiteral(text); + newText = newText + textParts.left + textParts.literal.replace(/\|/g, rep); + text = textParts.right; + } + + return newText + text; + }; + + + this.splitLiteral = function(text){ + var leftText = ""; + var rightText = ""; + var literalText = ""; + + var matchOpenLiteral = text.match(/(.*?)(!-.*)/); + leftText = matchOpenLiteral[1]; + if (matchOpenLiteral[2].match(/-!/)){ + var matchCloseLiteral = matchOpenLiteral[2].match(/(.*?-!)(.*)/); + literalText = matchCloseLiteral[1]; + rightText = matchCloseLiteral[2]; + } + else { + literalText = matchOpenLiteral[2]; + rightText = ""; + } + + return {left:leftText, literal:literalText, right:rightText}; + + }; + + + this.getRealColumnWidths = function(rows) { + var widths = []; + + this.each(rows, function(row, rowIndex) { + widths.push([]); + + this.each(row, function(column, columnIndex) { + widths[rowIndex][columnIndex] = column.length; + }, this); + }, this); + + return widths; + }; + + this.getMaxWidths = function(widths, totalNumberOfColumns) { + var maxWidths = []; + var row = null; + + this.each(widths, function(row, rowIndex) { + this.each(row, function(columnWidth, columnIndex) { + if(columnIndex == (row.length - 1) && row.length < totalNumberOfColumns) { + return false; + } + + if(columnIndex >= maxWidths.length) { + maxWidths.push(columnWidth); + } + else if(columnWidth > maxWidths[columnIndex]) { + maxWidths[columnIndex] = columnWidth; + } + }, this); + }, this); + + return maxWidths; + }; + + this.getNumberOfColumns = function(rows) { + var numberOfColumns = 0; + + this.each(rows, function(row) { + if(row.length > numberOfColumns) { + numberOfColumns = row.length; + } + }); + + return numberOfColumns; + }; + + this.getColspanWidth = function(widths, totalNumberOfColumns) { + var colspanWidths = []; + var colspan = null; + var colspanWidth = null; + + this.each(widths, function(row, rowIndex) { + if(row.length < totalNumberOfColumns) { + colspan = totalNumberOfColumns - row.length; + colspanWidth = row[row.length - 1]; + + if(colspan >= colspanWidths.length) { + colspanWidths[colspan] = colspanWidth; + } + else if(!colspanWidths[colspan] || colspanWidth > colspanWidths[colspan]) { + colspanWidths[colspan] = colspanWidth; + } + } + }); + + return colspanWidths; + }; + + this.setMaxWidthsOnNonColspanColumns = function(widths, maxWidths) { + this.each(widths, function(row, rowIndex) { + this.each(row, function(columnWidth, columnIndex) { + if(columnIndex == (row.length - 1) && row.length < maxWidths.length) { + return false; + } + + row[columnIndex] = maxWidths[columnIndex]; + }, this); + }, this); + }; + + this.getWidthOfLastNumberOfColumns = function(maxWidths, numberOfColumns) { + var width = 0; + + for(var i = 1; i <= numberOfColumns; i++) { + width += maxWidths[maxWidths.length - i]; + } + + return width + numberOfColumns - 1; //add in length of separators + }; + + this.spreadOutExcessOverLastNumberOfColumns = function(maxWidths, excess, numberOfColumns){ + var columnToApplyExcessTo = maxWidths.length - numberOfColumns; + + for(var i = 0; i < excess; i++) { + maxWidths[columnToApplyExcessTo++] += 1; + + if(columnToApplyExcessTo == maxWidths.length) { + columnToApplyExcessTo = maxWidths.length - numberOfColumns; + } + } + }; + + this.adjustWidthsForColspans = function(widths, maxWidths, colspanWidths) { + var lastNumberOfColumnsWidth = null; + var excess = null; + + this.each(colspanWidths, function(colspanWidth, index) { + lastNumberOfColumnsWidth = this.getWidthOfLastNumberOfColumns(maxWidths, index + 1); + + if(colspanWidth && colspanWidth > lastNumberOfColumnsWidth){ + excess = colspanWidth - lastNumberOfColumnsWidth; + this.spreadOutExcessOverLastNumberOfColumns(maxWidths, excess, index + 1); + this.setMaxWidthsOnNonColspanColumns(widths, maxWidths); + } + }, this); + }; + + this.adjustColspansForWidths = function(widths, maxWidths) { + var colspan = null; + var lastNumberOfColumnsWidth = null + + this.each(widths, function(row, rowIndex) { + colspan = maxWidths.length - row.length + 1; + + if(colspan > 1) { + row[row.length - 1] = this.getWidthOfLastNumberOfColumns(maxWidths, colspan); + } + }, this); + }; + + /* + * Utility functions + */ + this.trim = function(text) { + return (text || "").replace( /^\s+|\s+$/g, "" ); + }; + + this.each = function(array, callback, context) { + var index = 0; + var length = array.length; + + while(index < length && callback.call(context, array[index], index) !== false) { + index++; + } + }, + + this.rightPad = function(value, length) { + var padded = value; + + for(var i = 0, j = length - value.length; i < j; i++) { + padded += " "; + } + + return padded; + }; + +} diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/WikiFormatterTest.html b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/WikiFormatterTest.html similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/WikiFormatterTest.html rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/WikiFormatterTest.html index af7651b..922b56e 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/WikiFormatterTest.html +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/WikiFormatterTest.html @@ -1,175 +1,175 @@ - - - - - WikiFormatter Test - - - - - - - - - + + + + + WikiFormatter Test + + + + + + + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/clientSideSort.js b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/clientSideSort.js similarity index 95% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/clientSideSort.js rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/clientSideSort.js index 3dc0917..779b7fc 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/clientSideSort.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/clientSideSort.js @@ -1,181 +1,181 @@ -TableSorter = function(id, dateParser) -{ - this.id = id; - this.table = document.getElementById(id); - this.activeSort = null; - this.dateParser = dateParser; - - this.getSortDirection = function(sortCol) - { - if (this.activeSort == null || this.activeSort.column != sortCol) - this.activeSort = new SortReference(sortCol, "asc"); - else - { - if (this.activeSort.direction == "asc") - this.activeSort.direction = "dsc"; - else - this.activeSort.direction = "asc"; - } - return this.activeSort.direction; - } - - this.sort = function(sortCol, datatype) - { - var rowDataArray = new TableRowDataArray(this.id); - rowDataArray.setSortCol(sortCol); - var direction = this.getSortDirection(sortCol); - if (datatype == 'number') - rowDataArray.sort(new NumericComparator()); - else if (datatype == 'date') - rowDataArray.sort(new DateComparator(this.dateParser)); - else - rowDataArray.sort(); - if (direction == "dsc") - rowDataArray.reverse(); - rowDataArray.rebuildTable(); - } - return this; -} - -TableRowData = function(cols) -{ - this.cols = cols; - this.sortCol = 0; - this.setSortCol = function(col) - { - this.sortCol = col; - } - this.toString = function() - { - return this.cols[this.sortCol]; - } -} - -TableRowDataArray = function(id) -{ - this.arr = new Array(); - this.arr.table = document.getElementById(id); - this.arr.cssClasses = new Array(); - - var tbody = this.arr.table.tBodies[0]; - var rows = tbody.rows; - for (var row = 0; row < rows.length; row++) - { - this.arr.cssClasses.push(rows[row].className); - var cells = rows[row].cells; - var cellTextArray = new Array(); - for (var j = 0; j < cells.length; j++) - cellTextArray.push(cells[j].innerHTML); - this.arr.push(new TableRowData(cellTextArray)); - } - - this.arr.rebuildTable = function() - { - var tbody = this.table.tBodies[0]; - var mybody = tbody.cloneNode(false); - for (var row = 0; row < this.length; row++) - { - var tr = document.createElement("tr"); - tr.className = this.cssClasses[row]; - for (var i = 0; i < this[row].cols.length; i++) - { - var td = document.createElement("td"); - td.innerHTML = this[row].cols[i]; - tr.appendChild(td); - } - mybody.appendChild(tr); - } - this.table.replaceChild(mybody, tbody); - } - - this.arr.setSortCol = function(sortCol) - { - for (var i = 0; i < this.length; i++) - { - this[i].setSortCol(sortCol); - } - } - return this.arr; -} - -SortReference = function (column, direction) -{ - this.column = column; - this.direction = direction; -} - - -NumericComparator = function() -{ - function compare(a, b) - { - a = parseInt(a); - b = parseInt(b); - if (a > b) - return 1; - if (a < b) - return -1; - return 0; - } - return compare; -} - -DateComparator = function(dateParser) -{ - this.compare = function(x, y) - { - x = dateParser.parse(x).getTime(); - y = dateParser.parse(y).getTime(); - if (x > y) - return 1; - if (x < y) - return -1; - return 0; - } - return this.compare; -} - -DateParser = function(re, a, b, c, d, e, f) -{ - this.re = re; - this.a = a; - this.b = b; - this.c = c; - this.d = d || -1; - this.e = e || -1; - this.f = f || -1; - this.parseMonth = function(month) - { - month = month.toLowerCase(); - months = "jan,feb,mar,apr,may,jun,jul,aug,sep,oct,nov,dec".split(','); - for (var i = 0; i < months.length; i++) - { - if (month == months[i]) - { - return i; - } - } - } - - this.parse = function(dateStr) - { - value = dateStr.toString().toLowerCase(); - if (this.re.test(value)) - { - matches = this.re.exec(value); - year = parseInt(matches[a]); - if (parseInt(matches[b])) - month = parseInt(matches[b] - 1); - else - month = this.parseMonth(matches[b]); - day = parseInt(matches[c]); - hour = d > 0 ? parseInt(matches[d]) : 0; - minute = e > 0 ? parseInt(matches[e]) : 0; - second = f > 0 ? parseInt(matches[f]) : 0; - date = new Date(year, month, day, hour, minute, second); - return date; - } - } - - return this; -} +TableSorter = function(id, dateParser) +{ + this.id = id; + this.table = document.getElementById(id); + this.activeSort = null; + this.dateParser = dateParser; + + this.getSortDirection = function(sortCol) + { + if (this.activeSort == null || this.activeSort.column != sortCol) + this.activeSort = new SortReference(sortCol, "asc"); + else + { + if (this.activeSort.direction == "asc") + this.activeSort.direction = "dsc"; + else + this.activeSort.direction = "asc"; + } + return this.activeSort.direction; + } + + this.sort = function(sortCol, datatype) + { + var rowDataArray = new TableRowDataArray(this.id); + rowDataArray.setSortCol(sortCol); + var direction = this.getSortDirection(sortCol); + if (datatype == 'number') + rowDataArray.sort(new NumericComparator()); + else if (datatype == 'date') + rowDataArray.sort(new DateComparator(this.dateParser)); + else + rowDataArray.sort(); + if (direction == "dsc") + rowDataArray.reverse(); + rowDataArray.rebuildTable(); + } + return this; +} + +TableRowData = function(cols) +{ + this.cols = cols; + this.sortCol = 0; + this.setSortCol = function(col) + { + this.sortCol = col; + } + this.toString = function() + { + return this.cols[this.sortCol]; + } +} + +TableRowDataArray = function(id) +{ + this.arr = new Array(); + this.arr.table = document.getElementById(id); + this.arr.cssClasses = new Array(); + + var tbody = this.arr.table.tBodies[0]; + var rows = tbody.rows; + for (var row = 0; row < rows.length; row++) + { + this.arr.cssClasses.push(rows[row].className); + var cells = rows[row].cells; + var cellTextArray = new Array(); + for (var j = 0; j < cells.length; j++) + cellTextArray.push(cells[j].innerHTML); + this.arr.push(new TableRowData(cellTextArray)); + } + + this.arr.rebuildTable = function() + { + var tbody = this.table.tBodies[0]; + var mybody = tbody.cloneNode(false); + for (var row = 0; row < this.length; row++) + { + var tr = document.createElement("tr"); + tr.className = this.cssClasses[row]; + for (var i = 0; i < this[row].cols.length; i++) + { + var td = document.createElement("td"); + td.innerHTML = this[row].cols[i]; + tr.appendChild(td); + } + mybody.appendChild(tr); + } + this.table.replaceChild(mybody, tbody); + } + + this.arr.setSortCol = function(sortCol) + { + for (var i = 0; i < this.length; i++) + { + this[i].setSortCol(sortCol); + } + } + return this.arr; +} + +SortReference = function (column, direction) +{ + this.column = column; + this.direction = direction; +} + + +NumericComparator = function() +{ + function compare(a, b) + { + a = parseInt(a); + b = parseInt(b); + if (a > b) + return 1; + if (a < b) + return -1; + return 0; + } + return compare; +} + +DateComparator = function(dateParser) +{ + this.compare = function(x, y) + { + x = dateParser.parse(x).getTime(); + y = dateParser.parse(y).getTime(); + if (x > y) + return 1; + if (x < y) + return -1; + return 0; + } + return this.compare; +} + +DateParser = function(re, a, b, c, d, e, f) +{ + this.re = re; + this.a = a; + this.b = b; + this.c = c; + this.d = d || -1; + this.e = e || -1; + this.f = f || -1; + this.parseMonth = function(month) + { + month = month.toLowerCase(); + months = "jan,feb,mar,apr,may,jun,jul,aug,sep,oct,nov,dec".split(','); + for (var i = 0; i < months.length; i++) + { + if (month == months[i]) + { + return i; + } + } + } + + this.parse = function(dateStr) + { + value = dateStr.toString().toLowerCase(); + if (this.re.test(value)) + { + matches = this.re.exec(value); + year = parseInt(matches[a]); + if (parseInt(matches[b])) + month = parseInt(matches[b] - 1); + else + month = this.parseMonth(matches[b]); + day = parseInt(matches[c]); + hour = d > 0 ? parseInt(matches[d]) : 0; + minute = e > 0 ? parseInt(matches[e]) : 0; + second = f > 0 ? parseInt(matches[f]) : 0; + date = new Date(year, month, day, hour, minute, second); + return date; + } + } + + return this; +} diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/fitnesse.js b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/fitnesse.js similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/fitnesse.js rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/fitnesse.js index fd26934..bf4071e 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/fitnesse.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/fitnesse.js @@ -1,170 +1,170 @@ - -function symbolicLinkRename(linkName, resource) -{ - var newName = document.symbolics[linkName].value.replace(/ +/g, ''); - - if (newName.length > 0) - window.location = resource + '?responder=symlink&rename=' + linkName + '&newname=' + newName; - else - alert('Enter a new name first.'); -} - -function doSilentRequest(url) -{ - $.get(url); - return false; -} - -/** - * Scenario's and Exceptions (after test execution) - */ -$(document).on("click", "article tr.scenario td, article tr.exception td", function () { - $(this).parent().toggleClass('closed').nextUntil(":not(.exception-detail, .scenario-detail)").toggleClass("closed-detail"); -}); - -/** - * Collapsible section - */ -$(document) - .on("touchstart click", "article .collapsible > p.title", function () { - $(this).parent().toggleClass('closed'); - }) - .on("click", "article .collapsible > p.title a", function (event) { - // Do not open section when clicking on a link in the title, just follow the link. - event.stopPropagation(); - return true; - }) - .on('click', 'article .collapsible .expandall', function (event) { - var section = $(this).closest('.collapsible'); - section.find('.collapsible').andSelf().removeClass('closed'); - section.find('.scenario').removeClass('closed').next().show(); - return false; - }) - .on('click', 'article .collapsible .collapseall', function (event) { - section = $(this).closest('.collapsible'); - section.find('.collapsible, .scenario').andSelf().addClass('closed'); - section.find('.scenario').addClass('closed').next().hide(); - return false; - }); - -/** - * Notify user when changing page while test execution is in progress. - */ -window.onbeforeunload = function () { - if (document.querySelector("li#test-action .stop")){ - return "There is a test or suite currently running.\nAre you sure you want to navigate away from this page?"; - } -}; - -$(document).ready(function() { - - /** - * Field validations - */ - function validateField(re, msg) { - var pageNameError = $(this).data("error"); - if (!re.test($(this).val())) { - if (!pageNameError) { - pageNameError = $(msg); - $(this).after(pageNameError); - $(this).data("error", pageNameError); - } - pageNameError.show(); - } else { - if (pageNameError) { - pageNameError.hide(); - } - } - } - - $('input.wikiword').keyup(function () { - validateField.apply(this, - [/^[A-Z](?:[a-z0-9]+[A-Z][a-z0-9]*)+$/, - "

      The page name should be a valid WikiWord!

      "]); - }); - - $('input.wikipath').keyup(function () { - validateField.apply(this, - [/^(?:[<>^.])?(?:[A-Z](?:[a-z0-9]+[A-Z][a-z0-9]*)+[.]?)+$/, - "

      The page path should be a valid WikiPath.WikiWord!

      "]); - }); - - -}); - -function initErrorMetadata() { - var errors = $("table span.fail, table span.error, table td.fail, table tr.exception, table td.error") - .not(".scenario, .scenario .fail, .scenario .error, .exception .error"); - - $("#error-nav-max").text(errors.length); - - function validIndex(index) { - return index > 0 && index <= errors.length; - } - - function getCurrentErrorNavIndex() { - return parseInt($("#error-nav-text").val()); - } - - function setCurrentErrorNavIndex(index) { - $("#error-nav-text").val(index); - } - - function incrementErrorNavIndex(offset) { - var currentErrorNavIndex = getCurrentErrorNavIndex(); - currentErrorNavIndex += offset; - if (isNaN(currentErrorNavIndex) || currentErrorNavIndex > errors.length) { - currentErrorNavIndex = 1; - } else if (currentErrorNavIndex < 1) { - currentErrorNavIndex = errors.length; - } - setCurrentErrorNavIndex(currentErrorNavIndex); - navigateToCurrentError(); - } - - function unfoldErrors(element) { - element.parents('.scenario-detail').removeClass('closed-detail').prev().removeClass('closed'); - element.parents('.collapsible').removeClass('closed invisible'); - element.parents('tr.hidden').removeClass('hidden'); - } - - var highlight; - function navigateToCurrentError() { - var currentErrorNavIndex = getCurrentErrorNavIndex(); - - if (highlight) { - highlight.removeClass("selected-error"); - } - - highlight = $(errors[currentErrorNavIndex - 1]); - unfoldErrors(highlight); - highlight.addClass("selected-error"); - $('html, body').animate({ - scrollTop: highlight.offset().top - 200 - }, 500); - } - - $("#error-nav-prev").click(function () { - incrementErrorNavIndex(-1); - }); - - $("#error-nav-next").click(function () { - incrementErrorNavIndex(1); - }); - - $("#error-nav-text").change(function (){ - incrementErrorNavIndex(0); - }); - - /** - * Open scenario's and collapsed sections which contain failed or errorous tests - */ - unfoldErrors($('.fail,.error')); -} - - -/** Backwards compatibility */ -function toggleCollapsable(id) { $('#' + id).toggle().parent('.collapse_rim').toggleClass('open'); } -function expandAll() { $('.collapse_rim').each(function(i, e) { if (!$(e).hasClass('open')) { toggleCollapsable($(e).children().last().attr('id')) } }); } -function collapseAll() { $('.collapse_rim').each(function(i, e) { if ($(e).hasClass('open')) { toggleCollapsable($(e).children().last().attr('id')) } }); } - + +function symbolicLinkRename(linkName, resource) +{ + var newName = document.symbolics[linkName].value.replace(/ +/g, ''); + + if (newName.length > 0) + window.location = resource + '?responder=symlink&rename=' + linkName + '&newname=' + newName; + else + alert('Enter a new name first.'); +} + +function doSilentRequest(url) +{ + $.get(url); + return false; +} + +/** + * Scenario's and Exceptions (after test execution) + */ +$(document).on("click", "article tr.scenario td, article tr.exception td", function () { + $(this).parent().toggleClass('closed').nextUntil(":not(.exception-detail, .scenario-detail)").toggleClass("closed-detail"); +}); + +/** + * Collapsible section + */ +$(document) + .on("touchstart click", "article .collapsible > p.title", function () { + $(this).parent().toggleClass('closed'); + }) + .on("click", "article .collapsible > p.title a", function (event) { + // Do not open section when clicking on a link in the title, just follow the link. + event.stopPropagation(); + return true; + }) + .on('click', 'article .collapsible .expandall', function (event) { + var section = $(this).closest('.collapsible'); + section.find('.collapsible').andSelf().removeClass('closed'); + section.find('.scenario').removeClass('closed').next().show(); + return false; + }) + .on('click', 'article .collapsible .collapseall', function (event) { + section = $(this).closest('.collapsible'); + section.find('.collapsible, .scenario').andSelf().addClass('closed'); + section.find('.scenario').addClass('closed').next().hide(); + return false; + }); + +/** + * Notify user when changing page while test execution is in progress. + */ +window.onbeforeunload = function () { + if (document.querySelector("li#test-action .stop")){ + return "There is a test or suite currently running.\nAre you sure you want to navigate away from this page?"; + } +}; + +$(document).ready(function() { + + /** + * Field validations + */ + function validateField(re, msg) { + var pageNameError = $(this).data("error"); + if (!re.test($(this).val())) { + if (!pageNameError) { + pageNameError = $(msg); + $(this).after(pageNameError); + $(this).data("error", pageNameError); + } + pageNameError.show(); + } else { + if (pageNameError) { + pageNameError.hide(); + } + } + } + + $('input.wikiword').keyup(function () { + validateField.apply(this, + [/^[A-Z](?:[a-z0-9]+[A-Z][a-z0-9]*)+$/, + "

      The page name should be a valid WikiWord!

      "]); + }); + + $('input.wikipath').keyup(function () { + validateField.apply(this, + [/^(?:[<>^.])?(?:[A-Z](?:[a-z0-9]+[A-Z][a-z0-9]*)+[.]?)+$/, + "

      The page path should be a valid WikiPath.WikiWord!

      "]); + }); + + +}); + +function initErrorMetadata() { + var errors = $("table span.fail, table span.error, table td.fail, table tr.exception, table td.error") + .not(".scenario, .scenario .fail, .scenario .error, .exception .error"); + + $("#error-nav-max").text(errors.length); + + function validIndex(index) { + return index > 0 && index <= errors.length; + } + + function getCurrentErrorNavIndex() { + return parseInt($("#error-nav-text").val()); + } + + function setCurrentErrorNavIndex(index) { + $("#error-nav-text").val(index); + } + + function incrementErrorNavIndex(offset) { + var currentErrorNavIndex = getCurrentErrorNavIndex(); + currentErrorNavIndex += offset; + if (isNaN(currentErrorNavIndex) || currentErrorNavIndex > errors.length) { + currentErrorNavIndex = 1; + } else if (currentErrorNavIndex < 1) { + currentErrorNavIndex = errors.length; + } + setCurrentErrorNavIndex(currentErrorNavIndex); + navigateToCurrentError(); + } + + function unfoldErrors(element) { + element.parents('.scenario-detail').removeClass('closed-detail').prev().removeClass('closed'); + element.parents('.collapsible').removeClass('closed invisible'); + element.parents('tr.hidden').removeClass('hidden'); + } + + var highlight; + function navigateToCurrentError() { + var currentErrorNavIndex = getCurrentErrorNavIndex(); + + if (highlight) { + highlight.removeClass("selected-error"); + } + + highlight = $(errors[currentErrorNavIndex - 1]); + unfoldErrors(highlight); + highlight.addClass("selected-error"); + $('html, body').animate({ + scrollTop: highlight.offset().top - 200 + }, 500); + } + + $("#error-nav-prev").click(function () { + incrementErrorNavIndex(-1); + }); + + $("#error-nav-next").click(function () { + incrementErrorNavIndex(1); + }); + + $("#error-nav-text").change(function (){ + incrementErrorNavIndex(0); + }); + + /** + * Open scenario's and collapsed sections which contain failed or errorous tests + */ + unfoldErrors($('.fail,.error')); +} + + +/** Backwards compatibility */ +function toggleCollapsable(id) { $('#' + id).toggle().parent('.collapse_rim').toggleClass('open'); } +function expandAll() { $('.collapse_rim').each(function(i, e) { if (!$(e).hasClass('open')) { toggleCollapsable($(e).children().last().attr('id')) } }); } +function collapseAll() { $('.collapse_rim').each(function(i, e) { if ($(e).hasClass('open')) { toggleCollapsable($(e).children().last().attr('id')) } }); } + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/fitnesse_classic.js b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/fitnesse_classic.js similarity index 95% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/fitnesse_classic.js rename to src/test/resources/fitnesse-target/fitnesse/resources/javascript/fitnesse_classic.js index ee60c5d..38f1113 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/javascript/fitnesse_classic.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/javascript/fitnesse_classic.js @@ -1,18 +1,18 @@ -$(function () { - - /** - * Change a.button to a real button (so it looks the same), retaining link behaviour - */ - $('a.button').replaceWith(function () { - var self = $(this); - var button = $(' - - of - -
      -
      • -#if ($!errorNavOnDocumentReady) - -#end +
      +

      Failure Navigator

      +
      + + + of + +
      +
      +#if ($!errorNavOnDocumentReady) + +#end diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/executionLog.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/executionLog.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/executionLog.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/executionLog.vm index fdf0932..80d8acd 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/executionLog.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/executionLog.vm @@ -1,24 +1,24 @@ -|'''Date: '''| $currentDate | -|'''Test Page: '''|$testPage| -|'''Command: '''| !-${runner.command}-! | -|'''Exit code: '''| $runner.exitCode | -#set( $execTime = $runner.executionTime / 1000.0 ) -|'''Time elapsed: '''| $execTime seconds | - -#if( $runner.wroteToOutputStream() ) ----- -'''Standard Output:''' -{{{ $runner.output }}} -#end -#if( $runner.wroteToErrorStream() ) ----- -'''Standard Error:''' -{{{ $runner.error }}} -#end -#if( $exceptions.size() > 0 ) ----- -'''Internal Exception#if( $exceptions.size() > 1)s#end:''' -#foreach( $exception in $exceptions) -{{{ $exception.message }}} -#end -#end +|'''Date: '''| $currentDate | +|'''Test Page: '''|$testPage| +|'''Command: '''| !-${runner.command}-! | +|'''Exit code: '''| $runner.exitCode | +#set( $execTime = $runner.executionTime / 1000.0 ) +|'''Time elapsed: '''| $execTime seconds | + +#if( $runner.wroteToOutputStream() ) +---- +'''Standard Output:''' +{{{ $runner.output }}} +#end +#if( $runner.wroteToErrorStream() ) +---- +'''Standard Error:''' +{{{ $runner.error }}} +#end +#if( $exceptions.size() > 0 ) +---- +'''Internal Exception#if( $exceptions.size() > 1)s#end:''' +#foreach( $exception in $exceptions) +{{{ $exception.message }}} +#end +#end diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/header.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/header.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/header.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/header.vm index 709993b..f60bc28 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/header.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/header.vm @@ -1,13 +1,13 @@ -FitNesse - - -

      #if($pageTitle.Link)$pageTitle.Title#else$pageTitle.Title#end

      - -#if($pageTitle.PageTags)
      $pageTitle.PageTags
      #end - -##if($pageTitle.PageType)
      $pageTitle.PageType#end - +FitNesse + + +

      #if($pageTitle.Link)$pageTitle.Title#else$pageTitle.Title#end

      + +#if($pageTitle.PageTags)
      $pageTitle.PageTags
      #end + +##if($pageTitle.PageType)
      $pageTitle.PageType#end + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/mergePage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/mergePage.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/mergePage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/mergePage.vm index be64126..488aae2 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/mergePage.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/mergePage.vm @@ -1,23 +1,23 @@ -
      - - - - - #if( $!pageType ) - - #end - #foreach( $attr in $attributes ) - - #end - -

      This page has been recently modified. You may want to merge existing page content into your changes.

      -
      - - -
      -
      - - -
      - -
      +
      + + + + + #if( $!pageType ) + + #end + #foreach( $attr in $attributes ) + + #end + +

      This page has been recently modified. You may want to merge existing page content into your changes.

      +
      + + +
      +
      + + +
      + +
      diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/notFoundPage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/notFoundPage.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/notFoundPage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/notFoundPage.vm index 980954f..2c4f34e 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/notFoundPage.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/notFoundPage.vm @@ -1,6 +1,6 @@ -The requested resource: $name was not found. -#if($shouldCreate) -
      - -
      +The requested resource: $name was not found. +#if($shouldCreate) +
      + +
      #end \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/pageHistory.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/pageHistory.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/pageHistory.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/pageHistory.vm index 21da06f..4a014ad 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/pageHistory.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/pageHistory.vm @@ -1,37 +1,37 @@ -

      Page history

      -#if($pageHistory) -
      -
      - - - Cancel -
      - - - - - - - - - #set($dates = $pageHistory.datesInChronologicalOrder()) - #foreach($date in $dates) - - - #set($bar = $pageHistory.getPassFailBar($date, 50)) - - - - #if($bar.PassUnits > 0)#foreach($barsegment in [1..$bar.PassUnits])#end#end - #if($bar.FailUnits > 0)#foreach($barsegment in [1..$bar.FailUnits])#end#end - #set($ignores=50-($bar.PassUnits+$bar.FailUnits)) - #if($ignores > 0)#foreach($barsegment in [1..$ignores])#end#end - - #end -
      CompareTimePassFail0..$pageHistory.maxAssertions()
      0)"fail"#elseif($bar.Pass>0)"pass"#else"ignore"#end> - $pageHistory.formatDate("dd MMM, yy HH:mm", $date) - $bar.Pass$bar.Fail   
      -
      -#else -

      No history for page: $pageTitle.Title

      -#end +

      Page history

      +#if($pageHistory) +
      +
      + + + Cancel +
      + + + + + + + + + #set($dates = $pageHistory.datesInChronologicalOrder()) + #foreach($date in $dates) + + + #set($bar = $pageHistory.getPassFailBar($date, 50)) + + + + #if($bar.PassUnits > 0)#foreach($barsegment in [1..$bar.PassUnits])#end#end + #if($bar.FailUnits > 0)#foreach($barsegment in [1..$bar.FailUnits])#end#end + #set($ignores=50-($bar.PassUnits+$bar.FailUnits)) + #if($ignores > 0)#foreach($barsegment in [1..$ignores])#end#end + + #end +
      CompareTimePassFail0..$pageHistory.maxAssertions()
      0)"fail"#elseif($bar.Pass>0)"pass"#else"ignore"#end> + $pageHistory.formatDate("dd MMM, yy HH:mm", $date) + $bar.Pass$bar.Fail   
      +
      +#else +

      No history for page: $pageTitle.Title

      +#end diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/pageHistoryXML.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/pageHistoryXML.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/pageHistoryXML.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/pageHistoryXML.vm index a088222..3c591fc 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/pageHistoryXML.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/pageHistoryXML.vm @@ -1,22 +1,22 @@ - - - - #if($pageHistory) - - - $pageHistory.FullPageName - #set($dates = $pageHistory.datesInChronologicalOrder()) - #foreach($date in $dates) - - $date - $pageHistory.FullPageName?pageHistory&resultDate=$pageHistory.formatDate("yyyyMMddHHmmss",$date)&format=xml - #set($bar = $pageHistory.getPassFailBar($date, 50)) - $bar.Pass - $bar.Fail - - #end - - - #end - + + + + #if($pageHistory) + + + $pageHistory.FullPageName + #set($dates = $pageHistory.datesInChronologicalOrder()) + #foreach($date in $dates) + + $date + $pageHistory.FullPageName?pageHistory&resultDate=$pageHistory.formatDate("yyyyMMddHHmmss",$date)&format=xml + #set($bar = $pageHistory.getPassFailBar($date, 50)) + $bar.Pass + $bar.Fail + + #end + + + #end + \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/propertiesPage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/propertiesPage.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/propertiesPage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/propertiesPage.vm index ab251d5..cb7d455 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/propertiesPage.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/propertiesPage.vm @@ -1,137 +1,137 @@ -#macro( checked $attr )#if( $pageData.hasAttribute($attr) ) checked="checked"#end#end -#macro( value $prop ) value="$!{pageData.getAttribute( $prop )}"#end -

      $lastModified

      -
      - - -

      Page properties

      -
      -
      - Page type: - #foreach( $pageType in $pageTypes ) - - #end - - -
      - -
      - Actions: - #foreach( $action in $actionTypes ) - - #end -
      - -
      - Navigation: - #foreach( $navigation in $navigationTypes ) - - #end -
      - -
      - Security: - #foreach( $security in $securityTypes ) - - #end -
      -
      - -
      -
      - - -
      - -
      - - -
      -
      -
      - -
      -
      - -
      - #if ( $makeImportForm ) -
      -

      Wiki Import

      -

      Supply the URL for the wiki you'd like to import.

      - - -
      - -
      - #set( $submitMsg = "Import" ) - #elseif( $makeImportRootForm ) -

      Wiki Import Update

      -

      $pageTitle.title - imports its subpages from - $sourceUrl.

      - #set( $submitMsg = "Update Subpages" ) - #elseif( $makeImportSubpageForm ) -

      Wiki Import Update

      -

      $pageTitle.title imports its content and subpages from - $sourceUrl.

      - #set( $submitMsg = "Update Content and Subpages" ) - #end - - - -
      -
      - -
      -
      - - -
      - -

      Symbolic Links

      - - - - - - - #foreach( $symlink in $symlinks ) - - - - - - #end - - - - - -
      NamePath to PageActions
      - #if( $symlink.path ) - $symlink.link - #else - $symlink.link - #end - - Rename | Unlink -
      - - - - - -
      - - Cancel - -
      - - - - +#macro( checked $attr )#if( $pageData.hasAttribute($attr) ) checked="checked"#end#end +#macro( value $prop ) value="$!{pageData.getAttribute( $prop )}"#end +

      $lastModified

      +
      + + +

      Page properties

      +
      +
      + Page type: + #foreach( $pageType in $pageTypes ) + + #end + + +
      + +
      + Actions: + #foreach( $action in $actionTypes ) + + #end +
      + +
      + Navigation: + #foreach( $navigation in $navigationTypes ) + + #end +
      + +
      + Security: + #foreach( $security in $securityTypes ) + + #end +
      +
      + +
      +
      + + +
      + +
      + + +
      +
      +
      + +
      +
      + +
      + #if ( $makeImportForm ) +
      +

      Wiki Import

      +

      Supply the URL for the wiki you'd like to import.

      + + +
      + +
      + #set( $submitMsg = "Import" ) + #elseif( $makeImportRootForm ) +

      Wiki Import Update

      +

      $pageTitle.title + imports its subpages from + $sourceUrl.

      + #set( $submitMsg = "Update Subpages" ) + #elseif( $makeImportSubpageForm ) +

      Wiki Import Update

      +

      $pageTitle.title imports its content and subpages from + $sourceUrl.

      + #set( $submitMsg = "Update Content and Subpages" ) + #end + + + +
      +
      + +
      +
      + + +
      + +

      Symbolic Links

      + + + + + + + #foreach( $symlink in $symlinks ) + + + + + + #end + + + + + +
      NamePath to PageActions
      + #if( $symlink.path ) + $symlink.link + #else + $symlink.link + #end + + Rename | Unlink +
      + + + + + +
      + + Cancel + +
      + + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/refactorForm.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/refactorForm.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/refactorForm.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/refactorForm.vm index 6f70ee3..689c81a 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/refactorForm.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/refactorForm.vm @@ -1,69 +1,69 @@ -#if( !$type || $type == "replace" ) -
      -

      Replace

      - -
      - - -
      -
      - - -
      -
      - - Cancel -
      - -

      Search & Replace: - Please note that this feature is experimental! It uses java-based regular expressions. For an introduction, take a look here (new window). -

      -#end - -#if( !$type || $type == "delete" ) -
      -

      Delete page

      -

      Delete this entire sub-wiki.

      - -
      - - Cancel -
      -
      -#end - -#if( !$type || $type == "rename" ) -
      -

      Rename page

      - -
      - - -
      -
      - -
      -
      - - Cancel -
      -#end - -#if( !$type || $type == "move" ) - -

      Move page

      - -
      - - -
      -
      - -
      -
      - - Cancel -
      -
      +#if( !$type || $type == "replace" ) +
      +

      Replace

      + +
      + + +
      +
      + + +
      +
      + + Cancel +
      + +

      Search & Replace: + Please note that this feature is experimental! It uses java-based regular expressions. For an introduction, take a look here (new window). +

      +#end + +#if( !$type || $type == "delete" ) +
      +

      Delete page

      +

      Delete this entire sub-wiki.

      + +
      + + Cancel +
      +
      +#end + +#if( !$type || $type == "rename" ) +
      +

      Rename page

      + +
      + + +
      +
      + +
      +
      + + Cancel +
      +#end + +#if( !$type || $type == "move" ) + +

      Move page

      + +
      + + +
      +
      + +
      +
      + + Cancel +
      +
      #end \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/renameFileConfirmation.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/renameFileConfirmation.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/renameFileConfirmation.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/renameFileConfirmation.vm index a05a248..508ff3e 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/renameFileConfirmation.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/renameFileConfirmation.vm @@ -1,7 +1,7 @@ -
      - -Rename $filename to


      - - - -
      +
      + +Rename $filename to


      + + + +
      diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/render.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/render.vm similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/render.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/render.vm diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/searchForm.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/searchForm.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/searchForm.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/searchForm.vm index d9f0981..45237ed 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/searchForm.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/searchForm.vm @@ -1,71 +1,71 @@ -
      - -
      - - -
      -
      - - - Cancel -
      -

      Search Titles: Searches in page titles only. Will run fairly quickly.

      -

      Search Content: Searches in the content of every page. Don't hold your breath.

      -
      - -
      -#macro( anychecked $type )#if( !$request.hasInput($type) || $request.getInput($type).contains("Any") ) checked="checked"#end#end -#macro( checked $type $attr )#if( $request.getInput($type).contains($attr) ) checked="checked"#end#end - -

      Search Properties

      - - -
      - - -
      - -
      -
      - Page type: - #foreach( $pageType in $pageTypeAttributes ) - - #end -
      - -
      - Actions: - #foreach( $action in $actionAttributes ) - - #end -
      - -
      - Navigation: - #foreach( $navigation in $navigationAttributes ) - - #end -
      - -
      - Security: - #foreach( $security in $securityAttributes ) - - #end -
      - -
      - Special pages: - #foreach( $special in $specialAttributes ) - - #end -
      -
      -
      - -
      -
      - - +
      + +
      + + +
      +
      + + + Cancel +
      +

      Search Titles: Searches in page titles only. Will run fairly quickly.

      +

      Search Content: Searches in the content of every page. Don't hold your breath.

      +
      + +
      +#macro( anychecked $type )#if( !$request.hasInput($type) || $request.getInput($type).contains("Any") ) checked="checked"#end#end +#macro( checked $type $attr )#if( $request.getInput($type).contains($attr) ) checked="checked"#end#end + +

      Search Properties

      + + +
      + + +
      + +
      +
      + Page type: + #foreach( $pageType in $pageTypeAttributes ) + + #end +
      + +
      + Actions: + #foreach( $action in $actionAttributes ) + + #end +
      + +
      + Navigation: + #foreach( $navigation in $navigationAttributes ) + + #end +
      + +
      + Security: + #foreach( $security in $securityAttributes ) + + #end +
      + +
      + Special pages: + #foreach( $special in $specialAttributes ) + + #end +
      +
      +
      + +
      +
      + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/searchResults.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/searchResults.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/searchResults.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/searchResults.vm index 855ab7d..b67f07e 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/searchResults.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/searchResults.vm @@ -1,70 +1,70 @@ -

      Searching...

      - - - - - - - - - - - - #set( $hits = 0 ) - #traverse( $resultResponder ) - - - - - - - #set( $hits = $hits + 1 ) - #end - - -
      - Test - - Page - - Tags - - LastModified -
      - #if($result.getData().hasAttribute("Suite")) - - Suite - - #end - #if($result.getData().hasAttribute("Test")) - - Test - - #end - - $result.getPageCrawler().getFullPath($result).toString() - - #set ( $tags = $result.getData().getAttribute("Suites") ) - - $result.getData().getProperties().getLastModificationTime() -
      - -
      - Cancel -
      - -
      -

      To save this search as a link, paste the text below into a page.

      -
      [[Search below !-$page.getName()-! for <description>][$page.getPageCrawler().getFullPath($page)?$request]]
      - -#if ($hits > 1) - -#elseif ($hits == 1) - -#else - -#end - - +

      Searching...

      + + + + + + + + + + + + #set( $hits = 0 ) + #traverse( $resultResponder ) + + + + + + + #set( $hits = $hits + 1 ) + #end + + +
      + Test + + Page + + Tags + + LastModified +
      + #if($result.getData().hasAttribute("Suite")) + + Suite + + #end + #if($result.getData().hasAttribute("Test")) + + Test + + #end + + $result.getPageCrawler().getFullPath($result).toString() + + #set ( $tags = $result.getData().getAttribute("Suites") ) + + $result.getData().getProperties().getLastModificationTime() +
      + +
      + Cancel +
      + +
      +

      To save this search as a link, paste the text below into a page.

      +
      [[Search below !-$page.getName()-! for <description>][$page.getPageCrawler().getFullPath($page)?$request]]
      + +#if ($hits > 1) + +#elseif ($hits == 1) + +#else + +#end + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/shutdownPage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/shutdownPage.vm similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/shutdownPage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/shutdownPage.vm diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/skeleton.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/skeleton.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/skeleton.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/skeleton.vm index 1a0130d..1d5268f 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/skeleton.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/skeleton.vm @@ -1,55 +1,55 @@ - - - - #if( $baseUri )#end - - $title - ## Deal with HTML 5 element in older IE browsers - - - - - - - - - - - - - - - - -
      - #parse( $headerTemplate ) -
      - - #if( $!errorNavTemplate ) - #parse( $errorNavTemplate ) - #end - - - -
      - #parse( $mainTemplate ) -
      - - #if( $!footerTemplate ) -
      - #parse( $footerTemplate ) -
      - #end - - - + + + + #if( $baseUri )#end + + $title + ## Deal with HTML 5 element in older IE browsers + + + + + + + + + + + + + + + + +
      + #parse( $headerTemplate ) +
      + + #if( $!errorNavTemplate ) + #parse( $errorNavTemplate ) + #end + + + +
      + #parse( $mainTemplate ) +
      + + #if( $!footerTemplate ) +
      + #parse( $footerTemplate ) +
      + #end + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/stopTestPage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/stopTestPage.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/stopTestPage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/stopTestPage.vm index e8ba63d..5a8f0b6 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/stopTestPage.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/stopTestPage.vm @@ -1,7 +1,7 @@ -#if($testId) - Attempting to stop single test or suite...
      - $runningTestingTracker.stopProcess($testId) -#else - Attempting to stop all running test processes...
      - $runningTestingTracker.stopAllProcesses() +#if($testId) + Attempting to stop single test or suite...
      + $runningTestingTracker.stopProcess($testId) +#else + Attempting to stop all running test processes...
      + $runningTestingTracker.stopAllProcesses() #end \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteExecutionReport.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteExecutionReport.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteExecutionReport.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteExecutionReport.vm index 1baa413..96212a0 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteExecutionReport.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteExecutionReport.vm @@ -1,63 +1,63 @@ -#if($suiteExecutionReport) -

      $suiteExecutionReport.getRootPath()

      - - - - - -
      $suiteExecutionReport.getDate()FitNesse Version: $suiteExecutionReport.Version
      -
      -#set($finalCounts = $suiteExecutionReport.FinalCounts) -#if($finalCounts) -
      -
      - Test Pages: - $finalCounts.Right right, - $finalCounts.Wrong wrong, - $finalCounts.Ignores ignored, - $finalCounts.Exceptions exceptions - #if($suiteExecutionReport.hasRunTimes()) - ($suiteExecutionReport.totalRunTimeInMillis ms) - #end -
      -
      -#end -

      - - - - - - - - #if($suiteExecutionReport.hasRunTimes()) - - #end - - #foreach($pageHistoryReference in $suiteExecutionReport.getPageHistoryReferences()) - #set($counts = $pageHistoryReference.getTestSummary()) - - - - - - - #if($suiteExecutionReport.hasRunTimes()) - - #end - - #end -
      RightWrongIgnoredExceptionsPageRun time (ms)
      - $counts.Right - - $counts.Wrong - - $counts.Ignores - - $counts.Exceptions - - $pageHistoryReference.getPageName() - - $pageHistoryReference.RunTimeInMillis -
      -#end +#if($suiteExecutionReport) +

      $suiteExecutionReport.getRootPath()

      + + + + + +
      $suiteExecutionReport.getDate()FitNesse Version: $suiteExecutionReport.Version
      +
      +#set($finalCounts = $suiteExecutionReport.FinalCounts) +#if($finalCounts) +
      +
      + Test Pages: + $finalCounts.Right right, + $finalCounts.Wrong wrong, + $finalCounts.Ignores ignored, + $finalCounts.Exceptions exceptions + #if($suiteExecutionReport.hasRunTimes()) + ($suiteExecutionReport.totalRunTimeInMillis ms) + #end +
      +
      +#end +

      + + + + + + + + #if($suiteExecutionReport.hasRunTimes()) + + #end + + #foreach($pageHistoryReference in $suiteExecutionReport.getPageHistoryReferences()) + #set($counts = $pageHistoryReference.getTestSummary()) + + + + + + + #if($suiteExecutionReport.hasRunTimes()) + + #end + + #end +
      RightWrongIgnoredExceptionsPageRun time (ms)
      + $counts.Right + + $counts.Wrong + + $counts.Ignores + + $counts.Exceptions + + $pageHistoryReference.getPageName() + + $pageHistoryReference.RunTimeInMillis +
      +#end diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteHistoryXML.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteHistoryXML.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteHistoryXML.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteHistoryXML.vm index e708f66..777ca88 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteHistoryXML.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteHistoryXML.vm @@ -1,28 +1,28 @@ - - - $suiteExecutionReport.getVersion() - #escape($suiteExecutionReport.getRootPath()) - #foreach ($reference in $suiteExecutionReport.getPageHistoryReferences()) - - #escape($reference.getPageName()) - $reference.getDateString() - $reference.getPageName()?pageHistory&resultDate=$reference.getResultDate() - - $reference.getTestSummary().getRight() - $reference.getTestSummary().getWrong() - $reference.getTestSummary().getIgnores() - $reference.getTestSummary().getExceptions() - - $reference.RunTimeInMillis - - #end - - $suiteExecutionReport.getFinalCounts().getRight() - $suiteExecutionReport.getFinalCounts().getWrong() - $suiteExecutionReport.getFinalCounts().getIgnores() - $suiteExecutionReport.getFinalCounts().getExceptions() - - $suiteExecutionReport.TotalRunTimeInMillis - - - + + + $suiteExecutionReport.getVersion() + #escape($suiteExecutionReport.getRootPath()) + #foreach ($reference in $suiteExecutionReport.getPageHistoryReferences()) + + #escape($reference.getPageName()) + $reference.getDateString() + $reference.getPageName()?pageHistory&resultDate=$reference.getResultDate() + + $reference.getTestSummary().getRight() + $reference.getTestSummary().getWrong() + $reference.getTestSummary().getIgnores() + $reference.getTestSummary().getExceptions() + + $reference.RunTimeInMillis + + #end + + $suiteExecutionReport.getFinalCounts().getRight() + $suiteExecutionReport.getFinalCounts().getWrong() + $suiteExecutionReport.getFinalCounts().getIgnores() + $suiteExecutionReport.getFinalCounts().getExceptions() + + $suiteExecutionReport.TotalRunTimeInMillis + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteOverview.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteOverview.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteOverview.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteOverview.vm index b312750..32541af 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteOverview.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteOverview.vm @@ -1,60 +1,60 @@ -#if($treeRoot) - #set ($branch=$treeRoot) - #if ($branch.branches.size()==1) - #set ($branch=$branch.getBranches().get(0)) -

      -

      Results Summary

      -
      - - - - - - - - - - - - - - - - - - - -
      -
      -
      -
      -
      -
      -
      - $branch.getTestsPassed() ($branch.getPassedPercent()%) Test(s) Passed
      - $branch.getTestsUnrun()($branch.getUnrunPercent()%) Test(s) Not Run
      - $branch.getTestsFailed() ($branch.getFailedPercent()%)Test(s) Failed
      -
      - Cancel -
      - -
      -

      Detailed Results

      - $branch.getName() - - (Expand | - Collapse) - - - -
        - #parse("suiteOverviewNode.vm") -
      -
      - #else -
        - #parse("suiteOverviewNode.vm") - #end -#else -

        Sorry no information: $pageTitle.Title

        -#end +#if($treeRoot) + #set ($branch=$treeRoot) + #if ($branch.branches.size()==1) + #set ($branch=$branch.getBranches().get(0)) +
        +

        Results Summary

        +
        + + + + + + + + + + + + + + + + + + + +
        +
        +
        +
        +
        +
        +
        + $branch.getTestsPassed() ($branch.getPassedPercent()%) Test(s) Passed
        + $branch.getTestsUnrun()($branch.getUnrunPercent()%) Test(s) Not Run
        + $branch.getTestsFailed() ($branch.getFailedPercent()%)Test(s) Failed
        +
        + Cancel +
        + +
        +

        Detailed Results

        + $branch.getName() + + (Expand | + Collapse) + + + +
          + #parse("suiteOverviewNode.vm") +
        +
        + #else +
          + #parse("suiteOverviewNode.vm") + #end +#else +

          Sorry no information: $pageTitle.Title

          +#end diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteOverviewNode.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteOverviewNode.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteOverviewNode.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteOverviewNode.vm index 7ce8628..dee2815 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteOverviewNode.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteOverviewNode.vm @@ -1,23 +1,23 @@ -#foreach($branch in $branch.getBranches()) - #if ($branch.isTest()) -
        • $branch.getName()
          • - #else - -
        • - $branch.getName() ( - #if ($branch.getTestsPassed() != 0) - $branch.getTestsPassed()   $branch.getPassedPercentString() - #end - #if ($branch.getTestsUnrun() != 0) - $branch.getTestsUnrun()   $branch.getUnrunPercentString() - #end - #if ($branch.getTestsFailed() != 0) - $branch.getTestsFailed()   $branch.getFailedPercentString() - #end - ) -
            - #parse("suiteOverviewNode.vm") -
          -
          • - #end -#end +#foreach($branch in $branch.getBranches()) + #if ($branch.isTest()) +
        • $branch.getName()
          • + #else + +
        • + $branch.getName() ( + #if ($branch.getTestsPassed() != 0) + $branch.getTestsPassed()   $branch.getPassedPercentString() + #end + #if ($branch.getTestsUnrun() != 0) + $branch.getTestsUnrun()   $branch.getUnrunPercentString() + #end + #if ($branch.getTestsFailed() != 0) + $branch.getTestsFailed()   $branch.getFailedPercentString() + #end + ) +
            + #parse("suiteOverviewNode.vm") +
          +
          • + #end +#end diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suitePage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suitePage.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suitePage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/suitePage.vm index 107126b..e5f4ecb 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suitePage.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suitePage.vm @@ -1,23 +1,23 @@ - - -
          Running Tests ...
          - -
          - ## Filled with stop/output buttons -
          - -
          -

          Test Summaries

          - ## Filled with test results -
          - -## Test results are placed here: -$testExecutor.execute() + + +
          Running Tests ...
          + +
          + ## Filled with stop/output buttons +
          + +
          +

          Test Summaries

          + ## Filled with test results +
          + +## Test results are placed here: +$testExecutor.execute() diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteXML.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteXML.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteXML.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteXML.vm index b826134..18c5095 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/suiteXML.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/suiteXML.vm @@ -1,36 +1,36 @@ - - - $formatter.fitNesseVersion - #escape($formatter.rootPageName) - #foreach ($reference in $formatter.pageHistoryReferences) - #set($executionReport = $formatter.getTestExecutionReport($reference)) - #set($result = $executionReport.getResults().get(0)) - - - $result.Right - $result.Wrong - $result.Ignores - $result.Exceptions - - $result.RunTimeInMillis - #escape($result.RelativePageName) - $reference.getPageName()?pageHistory&resultDate=$reference.getResultDate()&format=xml - #if($result.Tags) - #escape($result.Tags) - #end - #if($formatter.shouldIncludeHtml()) - #escape($result.content) - #end - - #end - - - $formatter.getPageCounts().right - $formatter.getPageCounts().wrong - $formatter.getPageCounts().ignores - $formatter.getPageCounts().exceptions - - $formatter.TotalRunTimeInMillis - - - + + + $formatter.fitNesseVersion + #escape($formatter.rootPageName) + #foreach ($reference in $formatter.pageHistoryReferences) + #set($executionReport = $formatter.getTestExecutionReport($reference)) + #set($result = $executionReport.getResults().get(0)) + + + $result.Right + $result.Wrong + $result.Ignores + $result.Exceptions + + $result.RunTimeInMillis + #escape($result.RelativePageName) + $reference.getPageName()?pageHistory&resultDate=$reference.getResultDate()&format=xml + #if($result.Tags) + #escape($result.Tags) + #end + #if($formatter.shouldIncludeHtml()) + #escape($result.content) + #end + + #end + + + $formatter.getPageCounts().right + $formatter.getPageCounts().wrong + $formatter.getPageCounts().ignores + $formatter.getPageCounts().exceptions + + $formatter.TotalRunTimeInMillis + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/templates.properties b/src/test/resources/fitnesse-target/fitnesse/resources/templates/templates.properties similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/templates.properties rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/templates.properties diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testExecutionReport.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testExecutionReport.vm similarity index 95% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testExecutionReport.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/testExecutionReport.vm index 7e00552..190b60f 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testExecutionReport.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testExecutionReport.vm @@ -1,41 +1,41 @@ -#if($testExecutionReport) - - - - - -
          $testExecutionReport.DateFitNesse Version: $testExecutionReport.Version
          - -#foreach($testResult in $testExecutionReport.Results) -

          -

          -

          - - - - - - - - #if($testExecutionReport.hasRunTimes()) - - #end - -
          - - $testResult.RelativePageName - - - $testResult.Right Right - - $testResult.Wrong Wrong - - $testResult.Ignores Ignores - - $testResult.Exceptions Exceptions - - $testResult.runTimeInMillis ms -
          -

          $testResult.Content
          -#end -#end +#if($testExecutionReport) + + + + + +
          $testExecutionReport.DateFitNesse Version: $testExecutionReport.Version
          + +#foreach($testResult in $testExecutionReport.Results) +

          +

          +

          + + + + + + + + #if($testExecutionReport.hasRunTimes()) + + #end + +
          + + $testResult.RelativePageName + + + $testResult.Right Right + + $testResult.Wrong Wrong + + $testResult.Ignores Ignores + + $testResult.Exceptions Exceptions + + $testResult.runTimeInMillis ms +
          +

          $testResult.Content
          +#end +#end diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testHistory.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testHistory.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testHistory.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/testHistory.vm index 45f2ad3..4763230 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testHistory.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testHistory.vm @@ -1,47 +1,47 @@ -#set($noHistory = true) -
          - View as Overview - Purge > 30 days - Purge > 7 days - Purge all - Cancel -
          - - - - - - - - - - #foreach ($page in $testHistory.pageNames) - #set ($pageHistory = $testHistory.getPageHistory($page)) - #if($pageHistory) - #set($noHistory = false) - - - #set ($barGraph = $pageHistory.getBarGraph()) - - #if($pageHistory.passes==0) #set ($passClass = "ignore") - #else #set ($passClass = "pass") - #end - - #if($pageHistory.failures==0) #set ($failClass = "ignore") - #else #set ($failClass = "fail") - #end - - - - - - #foreach($passFail in $barGraph.passFailArray()) - - #end - - - #end - #end - -
          PagePassFailLatestLast 20 Results
          $page$pageHistory.passes$pageHistory.failures$barGraph.formatEndingDate("dd MMM yy, HH:mm")#if($passFail.pass)+#else-#end
          -#if ($noHistory)No History#end +#set($noHistory = true) +
          + View as Overview + Purge > 30 days + Purge > 7 days + Purge all + Cancel +
          + + + + + + + + + + #foreach ($page in $testHistory.pageNames) + #set ($pageHistory = $testHistory.getPageHistory($page)) + #if($pageHistory) + #set($noHistory = false) + + + #set ($barGraph = $pageHistory.getBarGraph()) + + #if($pageHistory.passes==0) #set ($passClass = "ignore") + #else #set ($passClass = "pass") + #end + + #if($pageHistory.failures==0) #set ($failClass = "ignore") + #else #set ($failClass = "fail") + #end + + + + + + #foreach($passFail in $barGraph.passFailArray()) + + #end + + + #end + #end + +
          PagePassFailLatestLast 20 Results
          $page$pageHistory.passes$pageHistory.failures$barGraph.formatEndingDate("dd MMM yy, HH:mm")#if($passFail.pass)+#else-#end
          +#if ($noHistory)No History#end diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testHistoryXML.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testHistoryXML.vm similarity index 95% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testHistoryXML.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/testHistoryXML.vm index 038541d..822eaff 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testHistoryXML.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testHistoryXML.vm @@ -1,22 +1,22 @@ - - - - #foreach ($page in $testHistory.pageNames) - #set ($pageHistory = $testHistory.getPageHistory($page)) - #if($pageHistory) - #set($linkExtra = "?pageHistory&format=xml") - - - $page - $page$linkExtra - $pageHistory.passes - $pageHistory.failures - $pageHistory.minDate - $pageHistory.maxDate - - - #end - #end - - - + + + + #foreach ($page in $testHistory.pageNames) + #set ($pageHistory = $testHistory.getPageHistory($page)) + #if($pageHistory) + #set($linkExtra = "?pageHistory&format=xml") + + + $page + $page$linkExtra + $pageHistory.passes + $pageHistory.failures + $pageHistory.minDate + $pageHistory.maxDate + + + #end + #end + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testNav.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testNav.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testNav.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/testNav.vm index 7050432..4118870 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testNav.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testNav.vm @@ -1,10 +1,10 @@ -
          -## The menu is only shown after the page executed. - - \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testPage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testPage.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testPage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/testPage.vm index ef403fd..a74313b 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testPage.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testPage.vm @@ -1,4 +1,4 @@ -
          Running Tests ...
          - -## Test results are placed here: -$testExecutor.execute() +
          Running Tests ...
          + +## Test results are placed here: +$testExecutor.execute() diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testResults.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testResults.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testResults.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/testResults.vm index bf05e95..7727930 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/testResults.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/testResults.vm @@ -1,92 +1,92 @@ - - - $response.Version - $response.RootPath - #foreach ($result in $response.Results) - - - $result.Right - $result.Wrong - $result.Ignores - $result.Exceptions - - $result.RunTimeInMillis - #escape($result.Content) - $result.RelativePageName - #if($result.Tags) - #escape($result.Tags) - #end - - #if($result.Tables.size() > 0) - - #foreach($table in $result.Tables) - - $table.Name - #foreach($row in $table) - - #foreach($col in $row) - #escape($col) - #end - - - #end - -
          - #end - -           - #end - - #if($result.Instructions.size() > 0) - - - #foreach($instructionResult in $result.Instructions) - - #escape($instructionResult.Instruction) - #escape($instructionResult.SlimResult) - #foreach($expectation in $instructionResult.Expectations) - - #if($expectation.Status) - $expectation.Status - #end - $expectation.InstructionId - #if($expectation.Col) - $expectation.Col - #end - #if($expectation.Row) - $expectation.Row - #end - #escape($expectation.Type) - #if($expectation.Actual) - #escape($expectation.Actual) - #end - #if($expectation.Expected) - #escape($expectation.Expected) - #end - #if($expectation.EvaluationMessage) - #escape($expectation.EvaluationMessage) - #end - - #end - - - #end - - - #end - -           - #end - - #if($response.FinalCounts) - - $response.FinalCounts.Right - $response.FinalCounts.Wrong - $response.FinalCounts.Ignores - $response.FinalCounts.Exceptions - - $response.TotalRunTimeInMillis - #end - -           - + + + $response.Version + $response.RootPath + #foreach ($result in $response.Results) + + + $result.Right + $result.Wrong + $result.Ignores + $result.Exceptions + + $result.RunTimeInMillis + #escape($result.Content) + $result.RelativePageName + #if($result.Tags) + #escape($result.Tags) + #end + + #if($result.Tables.size() > 0) + + #foreach($table in $result.Tables) + + $table.Name + #foreach($row in $table) + + #foreach($col in $row) + #escape($col) + #end + + + #end + +
          + #end + +           + #end + + #if($result.Instructions.size() > 0) + + + #foreach($instructionResult in $result.Instructions) + + #escape($instructionResult.Instruction) + #escape($instructionResult.SlimResult) + #foreach($expectation in $instructionResult.Expectations) + + #if($expectation.Status) + $expectation.Status + #end + $expectation.InstructionId + #if($expectation.Col) + $expectation.Col + #end + #if($expectation.Row) + $expectation.Row + #end + #escape($expectation.Type) + #if($expectation.Actual) + #escape($expectation.Actual) + #end + #if($expectation.Expected) + #escape($expectation.Expected) + #end + #if($expectation.EvaluationMessage) + #escape($expectation.EvaluationMessage) + #end + + #end + + + #end + + + #end + +           + #end + + #if($response.FinalCounts) + + $response.FinalCounts.Right + $response.FinalCounts.Wrong + $response.FinalCounts.Ignores + $response.FinalCounts.Exceptions + + $response.TotalRunTimeInMillis + #end + +           + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/unauthorized.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/unauthorized.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/unauthorized.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/unauthorized.vm index 4119dd8..75c754e 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/unauthorized.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/unauthorized.vm @@ -1,5 +1,5 @@ -

          Unauthorized

          -

          The requested resource: $resource is restricted.

          -

          Either your credientials were not supplied or they didn't match the criteria to access this resource.

          -
          -
          FitNesse
          +

          Unauthorized

          +

          The requested resource: $resource is restricted.

          +

          Either your credientials were not supplied or they didn't match the criteria to access this resource.

          +
          +
          FitNesse
          diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/versionNav.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/versionNav.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/versionNav.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/versionNav.vm index 6feea52..ce09eb7 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/versionNav.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/versionNav.vm @@ -1,10 +1,10 @@ - + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/versionPage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/versionPage.vm similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/versionPage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/versionPage.vm diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/versionSelection.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/versionSelection.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/versionSelection.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/versionSelection.vm index 3c98341..97a830e 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/versionSelection.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/versionSelection.vm @@ -1,30 +1,30 @@ -

          Select a version

          -
          -
          - - - Cancel -
          - - - - - - - - - - - - #foreach( $version in $versions ) - - - - - - - - #end - -
          CompareNameAuthorAge 
          $version.name$version.author$version.ageview
          -
          +

          Select a version

          +
          +
          + + + Cancel +
          + + + + + + + + + + + + #foreach( $version in $versions ) + + + + + + + + #end + +
          CompareNameAuthorAge 
          $version.name$version.author$version.ageview
          +
          diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/viewNav.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/viewNav.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/viewNav.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/viewNav.vm index dda966a..6c0f7cc 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/viewNav.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/viewNav.vm @@ -1,3 +1,3 @@ -
            -
          • View
            • + \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiFooter.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiFooter.vm similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiFooter.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiFooter.vm diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiImportingPage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiImportingPage.vm similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiImportingPage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiImportingPage.vm index 715eecd..09522a1 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiImportingPage.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiImportingPage.vm @@ -1,97 +1,97 @@ - -

            -#if( $isUpdate ) - Updating imported wiki. -#else - Importing wiki. -#end - This may take a few moments. -

            - -

            Destination wiki: $pageName

            - -

            Source wiki: $remoteUrl

            - -

            Imported pages:

            -
            - -## Meat -
              -#traverse( $importTraverser ) -
            • - #if( $result.type == "ERROR" ) -

              Import failure

              -

              $result.message

              - #if( $!result.exception ) -
                - #foreach( $stackElement in $result.exception.stackTrace ) -
              • ${stackElement.className}.${stackElement.methodName}:$stackElement.lineNumber
                • - #end -
              - #end - #elseif( $result.type == "AUTH" ) -
              -

              The wiki at $result.message requires authentication.

              - - - #if( $remoteUrl ) - - #end - - - - - - -
              - #else - #set( $relativePathName = $PathParser.render( $importer.relativePath ) ) - #set( $localPathName = $PathParser.render( $importer.localPath ) ) - $relativePathName - #end -
              • -#end -
            - -
             - -

            Import complete.

            - -#if( $importer.unmodifiedCount != 0 ) -

            - #if( $importer.unmodifiedCount == 1 ) - 1 page was unmodified. - #else - ${importer.unmodifiedCount} pages were unmodified. - #end -

            -#end - -

            - #if( $importer.importCount == 1 ) - 1 page was imported. - #else - ${importer.importCount} pages were imported. - #end -

            - -#set( $orphans = $importer.orphans ) -#if( $orphans.size() > 0) -

            #if( $orphans.size() == 1) - 1 orphaned page was found and has been removed. - #else - $orphans.size() orphaned pages were found and have been removed. - #end -

            -

            This may occur when a remote page is deleted, moved, or renamed.

            -

            Orphans:

            - -
              - #foreach( $path in $orphans ) -
            • $PathParser.render($path)
              • - #end -
            -
            -#end -$importer.autoUpdateSetting -

            Automatic Update turned#if( $importer.autoUpdateSetting ) ON#else OFF#end

            + +

            +#if( $isUpdate ) + Updating imported wiki. +#else + Importing wiki. +#end + This may take a few moments. +

            + +

            Destination wiki: $pageName

            + +

            Source wiki: $remoteUrl

            + +

            Imported pages:

            +
            + +## Meat +
              +#traverse( $importTraverser ) +
            • + #if( $result.type == "ERROR" ) +

              Import failure

              +

              $result.message

              + #if( $!result.exception ) +
                + #foreach( $stackElement in $result.exception.stackTrace ) +
              • ${stackElement.className}.${stackElement.methodName}:$stackElement.lineNumber
                • + #end +
              + #end + #elseif( $result.type == "AUTH" ) +
              +

              The wiki at $result.message requires authentication.

              + + + #if( $remoteUrl ) + + #end + + + + + + +
              + #else + #set( $relativePathName = $PathParser.render( $importer.relativePath ) ) + #set( $localPathName = $PathParser.render( $importer.localPath ) ) + $relativePathName + #end +
              • +#end +
            + +
             + +

            Import complete.

            + +#if( $importer.unmodifiedCount != 0 ) +

            + #if( $importer.unmodifiedCount == 1 ) + 1 page was unmodified. + #else + ${importer.unmodifiedCount} pages were unmodified. + #end +

            +#end + +

            + #if( $importer.importCount == 1 ) + 1 page was imported. + #else + ${importer.importCount} pages were imported. + #end +

            + +#set( $orphans = $importer.orphans ) +#if( $orphans.size() > 0) +

            #if( $orphans.size() == 1) + 1 orphaned page was found and has been removed. + #else + $orphans.size() orphaned pages were found and have been removed. + #end +

            +

            This may occur when a remote page is deleted, moved, or renamed.

            +

            Orphans:

            + +
              + #foreach( $path in $orphans ) +
            • $PathParser.render($path)
              • + #end +
            +
            +#end +$importer.autoUpdateSetting +

            Automatic Update turned#if( $importer.autoUpdateSetting ) ON#else OFF#end

            diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiNav.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiNav.vm similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiNav.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiNav.vm index 8935e62..d142c71 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiNav.vm +++ b/src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiNav.vm @@ -1,71 +1,71 @@ -#set( $localPath = $actions.localPageName ) -#set( $localOrRemotePath = $actions.localOrRemotePageName ) -#set( $openInNewWindow = $actions.newWindowIfRemote ) -
              - #if( $actions.suitePage ) -
            • Suite
              • - #end - #if( $actions.testPage ) -
            • Test
              • - #end - #if( $actions.withEdit && !$actions.imported) -
            • Edit
              • - #end - #if( $actions.imported ) -
            • Edit Locally
              • - #end - #if( $actions.imported ) -
            • Edit Remotely
              • - #end - - #if( $actions.withEdit) -
            • Add - -
              • - #end - -
            • Tools - #set( $nav_newsection = 0 ) - #macro( group $n )#if( $nav_newsection != 0 && $nav_newsection != $n ) class="divider"#end#set( $nav_newsection = $n )#end - -
              • -
            +#set( $localPath = $actions.localPageName ) +#set( $localOrRemotePath = $actions.localOrRemotePageName ) +#set( $openInNewWindow = $actions.newWindowIfRemote ) +
              + #if( $actions.suitePage ) +
            • Suite
              • + #end + #if( $actions.testPage ) +
            • Test
              • + #end + #if( $actions.withEdit && !$actions.imported) +
            • Edit
              • + #end + #if( $actions.imported ) +
            • Edit Locally
              • + #end + #if( $actions.imported ) +
            • Edit Remotely
              • + #end + + #if( $actions.withEdit) +
            • Add + +
              • + #end + +
            • Tools + #set( $nav_newsection = 0 ) + #macro( group $n )#if( $nav_newsection != 0 && $nav_newsection != $n ) class="divider"#end#set( $nav_newsection = $n )#end + +
              • +
            diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiPage.vm b/src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiPage.vm similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/templates/wikiPage.vm rename to src/test/resources/fitnesse-target/fitnesse/resources/templates/wikiPage.vm diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/testresource.txt b/src/test/resources/fitnesse-target/fitnesse/resources/testresource.txt similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/testresource.txt rename to src/test/resources/fitnesse-target/fitnesse/resources/testresource.txt diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/editor.css b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/editor.css similarity index 93% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/editor.css rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/editor.css index ea30660..1d6d070 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/editor.css +++ b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/editor.css @@ -1,103 +1,103 @@ -/* Styles in editor that differ from the "live" layout **/ -body { - margin: 0; -} - -p, table { - margin: 0.5em 0; -} - -p.meta { - margin: 0; -} - -p.comment { - color: #666; - font-style: italic; -} - -pre.wiki { - overflow: visible !important; - word-wrap: break-word !important; - white-space: -moz-pre-wrap !important; - white-space: pre-wrap !important; -} - -div.collapsable { - border: 1pt dotted #BF8660; - margin: 0.5em; - padding-left: 15px; - background: url(../images/collapsibleOpen.png) left top no-repeat #F9F9F9; - background-position: 2px 2px; - min-height: 1em; -} - -div.collapsable.collapsed { - background: url(../images/collapsibleClosed.png) left top no-repeat #F9F9F9; - background-position: 2px 2px; -} - -div.collapsable.hidden { - display: block; - background: url(../images/collapsibleHidden.png) left top no-repeat #F9F9F9; - background-position: 2px 2px; -} - -div.collapsable>p:first-child { -/* like .meta */ - color: #BF8660; - font-style: italic; -} - -tr.hidden { - display: table-row; - background-color: #eee; - color: #666; -} - -tt:before, -tt:after { - color: #BF8660; -} - -tt.htmlescape:before { - content: ""; -} - -tt.htmlescape:after { - content: ""; -} - -tt.inlinecode:before { - content: ""; -} - -tt.inlinecode:after { - content: ""; -} - -tt.plaintexttable:before { - content: ""; -} - -tt.plaintexttable:after { - content: ""; -} - -tt.hashtable:before { - content: ""; -} - -tt.hashtable:after { - content: ""; -} - -tt.nested:before { - content: ""; -} - -tt.nested:after { - content: ""; -} - - +/* Styles in editor that differ from the "live" layout **/ +body { + margin: 0; +} + +p, table { + margin: 0.5em 0; +} + +p.meta { + margin: 0; +} + +p.comment { + color: #666; + font-style: italic; +} + +pre.wiki { + overflow: visible !important; + word-wrap: break-word !important; + white-space: -moz-pre-wrap !important; + white-space: pre-wrap !important; +} + +div.collapsable { + border: 1pt dotted #BF8660; + margin: 0.5em; + padding-left: 15px; + background: url(../images/collapsibleOpen.png) left top no-repeat #F9F9F9; + background-position: 2px 2px; + min-height: 1em; +} + +div.collapsable.collapsed { + background: url(../images/collapsibleClosed.png) left top no-repeat #F9F9F9; + background-position: 2px 2px; +} + +div.collapsable.hidden { + display: block; + background: url(../images/collapsibleHidden.png) left top no-repeat #F9F9F9; + background-position: 2px 2px; +} + +div.collapsable>p:first-child { +/* like .meta */ + color: #BF8660; + font-style: italic; +} + +tr.hidden { + display: table-row; + background-color: #eee; + color: #666; +} + +tt:before, +tt:after { + color: #BF8660; +} + +tt.htmlescape:before { + content: ""; +} + +tt.htmlescape:after { + content: ""; +} + +tt.inlinecode:before { + content: ""; +} + +tt.inlinecode:after { + content: ""; +} + +tt.plaintexttable:before { + content: ""; +} + +tt.plaintexttable:after { + content: ""; +} + +tt.hashtable:before { + content: ""; +} + +tt.hashtable:after { + content: ""; +} + +tt.nested:before { + content: ""; +} + +tt.nested:after { + content: ""; +} + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/index.html b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/index.html similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/index.html rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/index.html index 9150f58..05f5b51 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/index.html +++ b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/index.html @@ -1,44 +1,44 @@ - - - - - wysiwyg test - - - - - - - - - -
            - -
            - - -
            -
            - - + + + + + wysiwyg test + + + + + + + + + +
            + +
            + + +
            +
            + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/menusprite.png b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/menusprite.png similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/menusprite.png rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/menusprite.png diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/pasting-spec.js b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/pasting-spec.js similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/pasting-spec.js rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/pasting-spec.js index 402f388..661dfd5 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/pasting-spec.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/pasting-spec.js @@ -1,188 +1,188 @@ - -describe("Paste", function () { - - var editor, contentDocument, contentBody; - - beforeEach(function() { - this.addMatchers({ - // Sometimes Firefox and Chrome react differently - toBeEither: function(expected1, expected2) { - var actual = this.actual; - return actual === expected1 || actual === expected2; - } - }); - }); - - beforeEach(function() { - document.getElementById("editor").innerHTML = ''; - jasmine.Clock.useMock(); - - Wysiwyg.paths = { base: ".", stylesheets: ["../css/fitnesse_wiki.css", "editor.css"] }; - var options = Wysiwyg.getOptions(); - editor = new Wysiwyg(document.getElementById("pageContent"), options); - jasmine.Clock.tick(1000); - - contentDocument = editor.contentDocument; - contentBody = contentDocument.getElementsByTagName("body")[0]; - - // Ensure the wysiwyg editor is visible - $('#editor-wysiwyg-1').click(); - }); - - function clearContent() { - while (contentBody.firstChild) { - contentBody.removeChild(contentBody.firstChild); - } - } - - function givenHtml(html) { - contentBody.innerHTML = html; - } - - function select(startQuery, startOffset, endQuery, endOffset) { - var startContainer = contentDocument.querySelector(startQuery); - var endContainer = contentDocument.querySelector(endQuery); - console.log(startContainer, endContainer); - editor.selectRange(startContainer.firstChild, startOffset, endContainer.firstChild, endOffset); - } - - function paste(something) { - $(contentBody).trigger("paste"); - editor.insertHTML(something); - jasmine.Clock.tick(20); - } - - it("should inset a single word before", function () { - givenHtml("

            page contains text

            "); - select("p", 0, "p", 0); - paste("test-"); - - expect(contentBody.innerHTML).toBe("

            test-page contains text

            "); - - }); - - it("should insert paragraph before current content", function () { - givenHtml("

            page contains text

            "); - select("p", 0, "p", 0); - paste("

            test-

            "); - - expect(contentBody.innerHTML).toBeEither( - "

            test-page contains text

            ", - "

            test-

            page contains text

            "); - - }); - - it("should replace text when selected", function () { - givenHtml("

            page contains text

            "); - select("p", 0, "p", 4); - paste("test"); - - expect(contentBody.innerHTML).toBe("

            test contains text

            "); - }); - - it("should replace all content if selected", function () { - givenHtml("

            Page contains text

            Another paragraph

            "); - select("p", 0, "p", 18); - paste("blah"); - - expect(contentBody.innerHTML).toBe("

            blah

            Another paragraph

            "); - }); - - it("should merge two paragraphs if text is selected over paragraph boundries", function () { - givenHtml('

            first

            second

            '); - select("#first", 1, "#second", 5); - paste("oo"); - - expect(contentBody.innerHTML).toBeEither( - '

            food

            ', - '

            food

            '); - }); - - describe("Pasting in tables", function () { - it("should paste only one line of content (plain text)", function () { - givenHtml('
            cell content
            '); - select("#first", 0, "#first", 4); - paste("new"); - - expect(contentBody.innerHTML).toBe('
            new content
            '); - }); - - it("should paste only one line of content (markup text)", function () { - givenHtml('
            cell content
            '); - select("#first", 0, "#first", 4); - paste("

            new

            "); - - expect(contentBody.innerHTML).toBeEither( - '
            new content
            ', - '
            new content
            '); - }); - - it("should add pasted tables to the parent table", function () { - givenHtml('
            cell content
            '); - select('#first', 0, '#first', 0); - paste('
            nested content
            '); - - expect(contentBody.innerHTML).toBe( - '
            cell content
            nested content
            '); - }); - - }); - - describe("Pasting wiki text", function () { - it("should format multi-line text", function () { - givenHtml("

            page contains text

            "); - select("p", 0, "p", 4); - paste("test\n\n"); - - expect(contentBody.innerHTML).toBeEither( - '

            test

            contains text

            ', - '

            test

            contains text

            '); - }); - - it("should format multi-line text formatted with br's (firefox)", function () { - givenHtml("

            page contains text

            "); - select("p", 0, "p", 4); - paste("test

            "); - - expect(contentBody.innerHTML).toBeEither( - '

            test

            contains text

            ', - 'test

            contains text

            '); - }); - - it("should format as rich text", function () { - givenHtml("

            page contains text

            "); - select("p", 0, "p", 4); - paste("''test''"); - - expect(contentBody.innerHTML).toBe("

            test contains text

            "); - }); - - it("should format as rich text", function () { - givenHtml("

            page contains text

            "); - select("p", 0, "p", 4); - paste("''test'' content\n\n'''test'''"); - - expect(contentBody.innerHTML).toBe('

            test content

            test contains text

            '); - }); - - it("should construct tables", function () { - givenHtml("

            page contains text

            "); - select("p", 0, "p", 4); - paste("| cell content |"); - - expect(contentBody.innerHTML).toBe('
            cell content contains text
            '); - }); - - it("should add table if table markup is pasted", function () { - givenHtml("

            page contains text

            "); - select("p", 0, "p", 0); - paste("| cell content |\n" + - "| more content |\n"); - - expect(contentBody.innerHTML).toBe('
            cell content
            more content

            page contains text

            '); - }); - - }); - - + +describe("Paste", function () { + + var editor, contentDocument, contentBody; + + beforeEach(function() { + this.addMatchers({ + // Sometimes Firefox and Chrome react differently + toBeEither: function(expected1, expected2) { + var actual = this.actual; + return actual === expected1 || actual === expected2; + } + }); + }); + + beforeEach(function() { + document.getElementById("editor").innerHTML = ''; + jasmine.Clock.useMock(); + + Wysiwyg.paths = { base: ".", stylesheets: ["../css/fitnesse_wiki.css", "editor.css"] }; + var options = Wysiwyg.getOptions(); + editor = new Wysiwyg(document.getElementById("pageContent"), options); + jasmine.Clock.tick(1000); + + contentDocument = editor.contentDocument; + contentBody = contentDocument.getElementsByTagName("body")[0]; + + // Ensure the wysiwyg editor is visible + $('#editor-wysiwyg-1').click(); + }); + + function clearContent() { + while (contentBody.firstChild) { + contentBody.removeChild(contentBody.firstChild); + } + } + + function givenHtml(html) { + contentBody.innerHTML = html; + } + + function select(startQuery, startOffset, endQuery, endOffset) { + var startContainer = contentDocument.querySelector(startQuery); + var endContainer = contentDocument.querySelector(endQuery); + console.log(startContainer, endContainer); + editor.selectRange(startContainer.firstChild, startOffset, endContainer.firstChild, endOffset); + } + + function paste(something) { + $(contentBody).trigger("paste"); + editor.insertHTML(something); + jasmine.Clock.tick(20); + } + + it("should inset a single word before", function () { + givenHtml("

            page contains text

            "); + select("p", 0, "p", 0); + paste("test-"); + + expect(contentBody.innerHTML).toBe("

            test-page contains text

            "); + + }); + + it("should insert paragraph before current content", function () { + givenHtml("

            page contains text

            "); + select("p", 0, "p", 0); + paste("

            test-

            "); + + expect(contentBody.innerHTML).toBeEither( + "

            test-page contains text

            ", + "

            test-

            page contains text

            "); + + }); + + it("should replace text when selected", function () { + givenHtml("

            page contains text

            "); + select("p", 0, "p", 4); + paste("test"); + + expect(contentBody.innerHTML).toBe("

            test contains text

            "); + }); + + it("should replace all content if selected", function () { + givenHtml("

            Page contains text

            Another paragraph

            "); + select("p", 0, "p", 18); + paste("blah"); + + expect(contentBody.innerHTML).toBe("

            blah

            Another paragraph

            "); + }); + + it("should merge two paragraphs if text is selected over paragraph boundries", function () { + givenHtml('

            first

            second

            '); + select("#first", 1, "#second", 5); + paste("oo"); + + expect(contentBody.innerHTML).toBeEither( + '

            food

            ', + '

            food

            '); + }); + + describe("Pasting in tables", function () { + it("should paste only one line of content (plain text)", function () { + givenHtml('
            cell content
            '); + select("#first", 0, "#first", 4); + paste("new"); + + expect(contentBody.innerHTML).toBe('
            new content
            '); + }); + + it("should paste only one line of content (markup text)", function () { + givenHtml('
            cell content
            '); + select("#first", 0, "#first", 4); + paste("

            new

            "); + + expect(contentBody.innerHTML).toBeEither( + '
            new content
            ', + '
            new content
            '); + }); + + it("should add pasted tables to the parent table", function () { + givenHtml('
            cell content
            '); + select('#first', 0, '#first', 0); + paste('
            nested content
            '); + + expect(contentBody.innerHTML).toBe( + '
            cell content
            nested content
            '); + }); + + }); + + describe("Pasting wiki text", function () { + it("should format multi-line text", function () { + givenHtml("

            page contains text

            "); + select("p", 0, "p", 4); + paste("test\n\n"); + + expect(contentBody.innerHTML).toBeEither( + '

            test

            contains text

            ', + '

            test

            contains text

            '); + }); + + it("should format multi-line text formatted with br's (firefox)", function () { + givenHtml("

            page contains text

            "); + select("p", 0, "p", 4); + paste("test

            "); + + expect(contentBody.innerHTML).toBeEither( + '

            test

            contains text

            ', + 'test

            contains text

            '); + }); + + it("should format as rich text", function () { + givenHtml("

            page contains text

            "); + select("p", 0, "p", 4); + paste("''test''"); + + expect(contentBody.innerHTML).toBe("

            test contains text

            "); + }); + + it("should format as rich text", function () { + givenHtml("

            page contains text

            "); + select("p", 0, "p", 4); + paste("''test'' content\n\n'''test'''"); + + expect(contentBody.innerHTML).toBe('

            test content

            test contains text

            '); + }); + + it("should construct tables", function () { + givenHtml("

            page contains text

            "); + select("p", 0, "p", 4); + paste("| cell content |"); + + expect(contentBody.innerHTML).toBe('
            cell content contains text
            '); + }); + + it("should add table if table markup is pasted", function () { + givenHtml("

            page contains text

            "); + select("p", 0, "p", 0); + paste("| cell content |\n" + + "| more content |\n"); + + expect(contentBody.innerHTML).toBe('
            cell content
            more content

            page contains text

            '); + }); + + }); + + }); \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/readme.md b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/readme.md similarity index 95% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/readme.md rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/readme.md index 2055fc2..3ec2ce2 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/readme.md +++ b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/readme.md @@ -1,26 +1,26 @@ -# Known limitations - -## Codeblocks - -In Fitnesse, it is allowed to do this: - - before{{{import fit.ColumnFixture; - - public class AddRemovePlayerFixture extends ColumnFixture { - public String playerName; - - } }}}after - -Both the 'before' and the 'after' text will be rendered as normal text. - -In wysiwyg editor, the {{{ and }}} need to be 'alone' on the line, as such: - - before - {{{ - import fit.ColumnFixture; - - public class AddRemovePlayerFixture extends ColumnFixture { - public String playerName; - } - }}} +# Known limitations + +## Codeblocks + +In Fitnesse, it is allowed to do this: + + before{{{import fit.ColumnFixture; + + public class AddRemovePlayerFixture extends ColumnFixture { + public String playerName; + + } }}}after + +Both the 'before' and the 'after' text will be rendered as normal text. + +In wysiwyg editor, the {{{ and }}} need to be 'alone' on the line, as such: + + before + {{{ + import fit.ColumnFixture; + + public class AddRemovePlayerFixture extends ColumnFixture { + public String playerName; + } + }}} after \ No newline at end of file diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/testcase.js b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/testcase.js similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/testcase.js rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/testcase.js index dca1807..1425fed 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/testcase.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/testcase.js @@ -1,1376 +1,1376 @@ -$(function() { - Wysiwyg.paths = { base: ".", stylesheets: [] }; - var options = Wysiwyg.getOptions(); - var instance = new Wysiwyg(document.getElementById("textarea"), options); - var contentDocument = instance.contentDocument; - - // Ensure the wysiwyg editor is visible - $('#editor-wysiwyg-1').click(); - - var d = document; - var wysiwygHtml = d.getElementById("wysiwyg-html"); - var showWysiwygHtml = d.getElementById("show-wysiwyg-html"); - setTimeout(function() { - if (showWysiwygHtml.checked) { - var body = contentDocument.body; - var browserIE = body.attachEvent ? true : false; - var elements = body.getElementsByTagName("br"); - var count = 0; - var html = body.innerHTML.replace(/<[Bb][Rr] *[^>\/]*/g, function(value) { - var element = elements[count++]; - var attributes = element.attributes; - var length = attributes.length; - if (length == 0) - return value; - var texts = [ value ]; - for (var i = 0; i < length; i++) { - var attr = attributes[i]; - if (!browserIE || !!element[attr.name]) { - texts.push(' ', attr.name, '="', attr.value, '"'); - } - } - return texts.join(""); - }); - if (wysiwygHtml.value != html) { - wysiwygHtml.value = html; - } - } - setTimeout(arguments.callee, 500); - }, 500); - - function generate(dom, wikitext, options, withoutDomToWikitext, withoutWikitextToFragment) { - dom = dom.cloneNode(true); - var anonymous = dom.ownerDocument.createElement("div"); - anonymous.appendChild(dom); - - if (!withoutWikitextToFragment) { - var fragment = instance.wikitextToFragment(wikitext, contentDocument, options); - var generated = contentDocument.createElement("div"); - generated.appendChild(fragment); - var generatedHtml = generated.innerHTML; - if (!generated.addEventListener || window.opera) { - generatedHtml = generatedHtml.replace(/\n\r/g, "\uffff").replace(/\uffff\n?/g, "\n"); - } - this.assertEqual(anonymous.innerHTML, generatedHtml, "wikitextToFragment"); - } - if (!withoutDomToWikitext) { - this.assertEqual(wikitext + "\n", instance.domToWikitext(anonymous, options), "domToWikitext"); - } - } - - function generateFragment(dom, wikitext, options) { - generate.call(this, dom, wikitext, options, true, false); - } - - function generateWikitext(dom, wikitext, options) { - generate.call(this, dom, wikitext, options, false, true); - } - - function run() { - var unit = new Wysiwyg.TestUnit(); - var fragment = unit.fragment; - var element = unit.element; - var br = function() { return element("br") }; - var a = function(link, label, autolink) { - var attrs = { - href: link, - title: link, - 'data-wysiwyg-link': link }; - if (autolink) { - attrs['data-wysiwyg-autolink'] = 'true'; - } - return element("a", attrs, label || link); - }; - - unit.add("treeWalk", function() { - var list; - function iterator(node) { - var value; - if (node) { - switch (node.nodeType) { - case 1: value = node.tagName.toLowerCase(); break; - case 3: value = "#text"; break; - } - } - else { - value = "(null)"; - } - list.push(value); - } - - function doTreeWalk(expected, dom) { - list = []; - instance.treeWalk(dom, iterator); - this.assertEqual(expected, list.join(" ")); - - list = []; - instance._treeWalkEmulation(dom, iterator); - this.assertEqual(expected, list.join(" ")); - } - - doTreeWalk.call(this, "p #text (null)", element("div", element("p", "paragraph"))); - doTreeWalk.call(this, "#text (null)", element("div", element("p", "paragraph")).firstChild); - doTreeWalk.call(this, "(null)", element("div", element("p")).firstChild); - - var dom = element("div"); - dom.innerHTML = [ - '

            Tables

            ', - '

            ', - 'Simple tables can be created like this:', - '

            ', - '
            ||Cell 1||Cell 2||Cell 3||',
-                '||Cell 4||Cell 5||Cell 6||',
-                '

            ', - 'Display:', - '

            ', - '', - '
            Cell 1Cell 2Cell 3', - '
            Cell 4Cell 5Cell 6', - '
            ', - '

            ', - 'Note that more complex tables can be created using', - 'reStructuredText.', - '

            ' ].join(""); - var expected = [ - 'h2', '#text', 'p', '#text', 'pre', '#text', 'p', '#text', - 'table', 'tbody', - 'tr', 'td', '#text', 'td', '#text', 'td', '#text', - 'tr', 'td', '#text', 'td', '#text', 'td', '#text', - 'p', '#text', 'a', '#text', 'em', '#text', '#text', '#text', - '(null)'].join(" "); - doTreeWalk.call(this, expected, dom); - }); - - unit.add("isLastChildInBlockNode", function() { - var dom = fragment( - element("p", element("br")), - element("p", "foobar", element("br"), "foobar"), - element("p", element("b", "foobar", element("br"))), - element("p", element("b", "foobar"), element("br")), - element("br")); - var count = 0; - function assert(expected, node) { - this.assertEqual(expected, instance.isLastChildInBlockNode(node), "#" + (count++)); - } - assert.call(this, true, dom.childNodes[0].childNodes[0]); - assert.call(this, false, dom.childNodes[1].childNodes[0]); - assert.call(this, false, dom.childNodes[1].childNodes[1]); - assert.call(this, true, dom.childNodes[1].childNodes[2]); - assert.call(this, false, dom.childNodes[2].childNodes[0].childNodes[0]); - assert.call(this, true, dom.childNodes[2].childNodes[0].childNodes[1]); - assert.call(this, false, dom.childNodes[3].childNodes[0].childNodes[0]); - assert.call(this, true, dom.childNodes[3].childNodes[1]); - assert.call(this, true, dom.childNodes[4]); - }); - - unit.add("code block", function() { - var dom = fragment( - element("p", "`abc`"), - element("p", element("pre", br(), "{{{code-block", br()))); - var wikitext = [ - "`abc`", - "", - "{{{", - "{{{code-block", - "}}}" ].join("\n"); - generate.call(this, dom, wikitext); - }); - unit.add("code block nest", function() { - var dom = fragment( - element("p", element("pre", br(), "#!python", br(), "= level 1", br(), "{{{", br(), "= level 2", br()), " = level 1}}}")); - var wikitext = [ - "{{{", - "#!python", - "= level 1", - "{{{", - "= level 2", - "}}}", - "= level 1", - "}}}" ].join("\n"); - generateFragment.call(this, dom, wikitext); - generateWikitext.call(this, dom, [ - "{{{", - "#!python", - "= level 1", - "{{{", - "= level 2", - "}}}= level 1}}}" ].join("\n")); - }); - - unit.add("code block with empty lines", function() { - var dom = fragment( - element("p", "test:", - element("pre", br(), "first line", br(), br(), " second line "))); - var wikitext = [ - "test:{{{", - "first line", - "", - " second line }}}" ].join("\n"); - generate.call(this, dom, wikitext); - }); - - unit.add("paragraph", function() { - var dom = fragment( - element("p", "Paragraph continued..."), - element("p", "Second paragraph continued...")); - generateFragment.call(this, dom, [ - "Paragraph", - "continued...", - "", - "Second paragraph", - "continued...", - "" ].join("\n")); - generate.call(this, dom, [ - "Paragraph continued...", - "", - "Second paragraph continued..." ].join("\n")); - }); - - unit.add("link", function() { - var dom = fragment( - element("p", a("LinkPage", "LinkPage", true))); - generate.call(this, dom, - "LinkPage"); - }); - - unit.add("link with markup", function() { - var dom = fragment( - element("p", a("LinkPage", element("i", "label")))); - generate.call(this, dom, - "[[''label''][LinkPage]]"); - }); - - unit.add("link with hash", function() { - var dom = fragment( - element("p", a("LinkPage#foo", "label"))); - generate.call(this, dom, - "[[label][LinkPage#foo]]"); - }); - - unit.add("link with parameter", function() { - var dom = fragment( - element("p", a("LinkPage?edit&test", "label"))); - generate.call(this, dom, - "[[label][LinkPage?edit&test]]"); - }); - - unit.add("wiki macros", function() { - var dom = fragment( - element("table", element("tbody", - element("tr", element("td", "!c !2 Contents")), - element("tr", element("td", "!contents -g")))), - element("p", { 'class': 'meta' }, "!path fitnesse.jar"), - element("p", { 'class': 'meta' }, "!path classes")); - generateFragment.call(this, dom, [ - "|!c !2 Contents|", - "|!contents -g|", - "", - "!path fitnesse.jar", - "!path classes" ].join("\n")); - }); - - unit.add("hr", function() { - var dom = fragment( - element("p", "Paragraph"), - element("hr"), - element("p", "Another paragraph"), - element("hr")); - generateFragment.call(this, dom, [ - "Paragraph", - "----", - "Another paragraph", - "----" ].join("\n")); - generate.call(this, dom, [ - "Paragraph", - "", - "----", - "Another paragraph", - "", - "----" ].join("\n")); - }); - - unit.add("escape !- .. -! - literal escape", function() { - var dom = element("p", "foo ", element("tt", {'class': 'escape'}, "bar"), " baz"); - var wikitext = "foo !-bar-! baz"; - generate.call(this, dom, wikitext); - }); - - unit.add("escape !< .. >! - html escape", function() { - var dom = element("p", "foo ", element("tt", {'class': 'htmlescape'}, "bar"), " baz"); - var wikitext = "foo !! baz"; - generate.call(this, dom, wikitext); - }); - - unit.add("escape !{ .. }! - hashtable", function() { - var dom = element("p", "foo ", element("tt", {'class': 'hashtable'}, "bar: val"), " baz"); - var wikitext = "foo !{bar: val}! baz"; - generate.call(this, dom, wikitext); - }); - - unit.add("escape !( .. )! - nested ", function() { - var dom = element("p", "foo ", element("tt", {'class': 'nested'}, "bar"), " baz"); - var wikitext = "foo !(bar)! baz"; - generate.call(this, dom, wikitext); - }); - - unit.add("escape ![ .. ]! - plain text table", function() { - var dom = element("p", "foo ", element("tt", {'class': 'plaintexttable'}, "bar", br(), "baz"), " bee"); - var wikitext = "foo ![bar\nbaz]! bee"; - generate.call(this, dom, wikitext); - }); - - unit.add("bold italic", function() { - var dom = element("p", element("b", element("i", "bold italic"))); - var wikitext = "'''''bold italic'''''"; - generate.call(this, dom, wikitext); - }); - - unit.add("bold", function() { - var wikitext = [ - "The quick '''brown''' fox.", - "", - "The quick '''brown''' fox." ].join("\n"); - generateWikitext.call(this, - fragment( - element("p", "The quick ", element("b", "brown"), " fox."), - element("p", "The quick ", element("strong", "brown"), " fox.")), - wikitext); - generateFragment.call(this, - fragment( - element("p", "The quick ", element("b", "brown"), " fox."), - element("p", "The quick ", element("b", "brown"), " fox.")), - wikitext); - }); - unit.add("italic", function() { - var wikitext = [ - "The quick ''brown'' fox.", - "", - "The quick ''brown'' fox." ].join("\n"); - generateWikitext.call(this, - fragment( - element("p", "The quick ", element("i", "brown"), " fox."), - element("p", "The quick ", element("em", "brown"), " fox.")), - wikitext); - generateFragment.call(this, - fragment( - element("p", "The quick ", element("i", "brown"), " fox."), - element("p", "The quick ", element("i", "brown"), " fox.")), - wikitext); - }); - unit.add("strike-through", function() { - var dom = element("p", element("strike", "strike-through")); - var wikitext = "--strike-through--"; - generate.call(this, dom, wikitext); - }); - unit.add("code", function() { - var dom = element("p", "`monospace`", - ", ", element("pre", "mono`s`pace"), - ", ", "`mono", element("pre", "s"), "pace`"); - var wikitext = "`monospace`, {{{mono`s`pace}}}, `mono{{{s}}}pace`"; - generateFragment.call(this, dom, "`monospace`, {{{mono`s`pace}}}, `mono{{{s}}}pace`"); - generateWikitext.call(this, dom, "`monospace`,{{{mono`s`pace}}}, `mono{{{s}}}pace`"); - }); - unit.add("escaped !-..-!", function() { - var dom = element("p", "`monospace`", - ", ", element("tt", {'class': 'escape'}, "mono`s`pace"), - ", ", "`mono", element("tt", {'class': 'escape'}, "s"), "pace`", - ", ", element("tt", {'class': 'escape'}, "
            • list item
            ")); - generate.call(this, dom, "`monospace`, !-mono`s`pace-!, `mono!-s-!pace`, !-
            • list item
            -!"); - }); - unit.add("italic -> bold", function() { - var dom = element("p", - "normal", - element("i", "italic"), - element("b", "bold"), - "normal"); - var wikitext = "normal''italic'''''bold'''normal"; - generate.call(this, dom, wikitext); - }); - unit.add("bold -> italic", function() { - var dom = element("p", - "normal", - element("b", "bold"), - element("i", "italic"), - "normal"); - var wikitext = "normal'''bold'''''italic''normal"; - generate.call(this, dom, wikitext); - }); - unit.add("[ italic [ xyz ] bold ]", function() { - var dom = element("p", - "normal", - element("i", "italic", element("b", "xyz")), - element("b", "bold"), - "normal"); - var wikitext = "normal''italic'''xyz''bold'''normal"; - generate.call(this, dom, wikitext); - }); - unit.add("overlapped markups", function() { - var dom = element("p", - "normal", - element("b", "bold", - element("i", "italic", - element("strike", "strike-through")), - "sub"), - "."); - var wikitext = "normal'''bold''italic--strike-through--''sub'''."; - generateFragment.call(this, dom, wikitext); - }); - unit.add("repeated markups", function() { - generateWikitext.call(this, - element("p", "ab", element("b", "cd"), element("b", "ef"), "gh"), - "ab'''cdef'''gh"); - generateWikitext.call(this, - element("p", "ab", element("i", "cd"), element("i", "ef"), "gh"), - "ab''cdef''gh"); - generateWikitext.call(this, - element("p", "ab", - element("i", element("b", "cd")), - element("b", element("i", "ef")), - "gh"), - "ab'''''cdef'''''gh"); - }); - unit.add("markups without text", function() { - generateWikitext.call(this, - element("p", "abc", element("b", ""), "def"), - "abcdef"); - generateWikitext.call(this, - element("p", "abc", element("i", ""), "def"), - "abcdef"); - generateWikitext.call(this, - element("p", "abc", element("tt", ""), "def"), - "abcdef"); - generateWikitext.call(this, - element("p", "abc", element("b", element("i", "")), "def"), - "abcdef"); - generateWikitext.call(this, - element("p", "abc", element("i", element("b", "")), "def"), - "abcdef"); - }); - - unit.add("! bold italic", function() { - var dom = element("p", element("b", element("i", "bold", - element("tt", {'class': 'escape'}, "'''''"), " italic")), "."); - var wikitext = "'''''bold!-'''''-! italic'''''."; - generate.call(this, dom, wikitext); - }); - unit.add("! bold", function() { - var dom = element("p", element("b", "bold", element("tt", {'class': 'escape'}, "'''"), " bold"), "."); - var wikitext = "'''bold!-'''-! bold'''."; - generate.call(this, dom, wikitext); - }); - unit.add("! italic", function() { - var dom = element("p", element("i", "italic", element("tt", {'class': 'escape'}, "''"), " italic"), "."); - var wikitext = "''italic!-''-! italic''."; - generate.call(this, dom, wikitext); - }); - unit.add("! strike-through", function() { - var dom = element("p", element("strike", "strike", element("tt", {'class': 'escape'}, "--"), "through"), "."); - var wikitext = "--strike!----!through--."; - generate.call(this, dom, wikitext); - }); - unit.add("! monospace", function() { - var dom = element("p", element("tt", {'class': 'escape'}, "{{{monospace}}}"), " or ", - element("tt", {'class': 'escape'}, "`monospace`")); - var wikitext = "!-{{{monospace}}}-! or !-`monospace`-!"; - generate.call(this, dom, wikitext); - }); - - unit.add("multiline escape", function() { - var dom = element("p", element("tt", {'class': 'escape'}, "escaped", br(), "\"quoted line\"", br()), br()); - var wikitext = [ - "!-escaped", - "\"quoted line\"", - "-!" ].join("\n"); - generate.call(this, dom, wikitext); - }); - - unit.add("multiline escape 2", function() { - var dom = element("p", {"class": "meta"}, "!define var (", element("tt", {'class': 'escape'}, "escaped", br(), "line", br(), "123", br()), ")"); - var wikitext = [ - "!define var (!-escaped", - "line", - "123", - "-!)" ].join("\n"); - generate.call(this, dom, wikitext); - }); - - unit.add("WikiPageName", function() { - var dom = fragment( - element("p", - a("CamelCase", "CamelCase", true), - " ", element("tt", {'class': 'escape'}, "CamelCase"), " ", - a("FooBarA", "FooBarA", true), " FOo ", - a("FoobarA", "FoobarA", true), " ", - a("ChildLink", ">ChildLink", true), " ", - a(".AbsoluteLink", ".AbsoluteLink", true), " ", - a(".AbsoluteLink.WikiPage", ".AbsoluteLink.WikiPage", true), - " OneÅngström Oneångström setTextColor")); - generateFragment.call(this, dom, - "CamelCase !-CamelCase-! FooBarA FOo FoobarA ChildLink .AbsoluteLink .AbsoluteLink.WikiPage OneÅngström Oneångström setTextColor"); - }); - - unit.add("links2wiki", function() { - var dom = fragment( - element("p", - a("TestPage", "label"), - a("TestPage", "läbel"), - a("TestPage", "TestPage", true), - a("FrontPage?edit", "Edit"), - " button and add a ", - a("FitNesse.UserGuide.WikiWord", element("tt", {'class': 'escape'}, "WikiWord")), - a("http://external.link/bladieblah", "bla") - )); - - var wikitext = "[[label][TestPage]]" - + "[[läbel][TestPage]]" - + "TestPage" - + "[[Edit][FrontPage?edit]] button and add a [[!-WikiWord-!][FitNesse.UserGuide.WikiWord]]" - + "[[bla][http://external.link/bladieblah]]"; - - // should go both ways (wiki2html and html2wiki) - generate.call(this, dom, wikitext); - //generateFragment.call(this, dom, wikitext); - }); - - unit.add("header", function() { - var dom = fragment( - element("h1", "Heading 1"), - element("h2", "Heading 2"), - element("h3", element("b", "Heading"), " ", element("i", "3")), - element("h4", "Heading 4 with ", a("WikiStart", "WikiStart", true)), - element("h5", "Heading 5"), - element("h6", "Heading 6")); - generate.call(this, dom, [ - "!1 Heading 1", - "!2 Heading 2", - "!3 '''Heading''' ''3''", - "!4 Heading 4 with WikiStart", - "!5 Heading 5", - "!6 Heading 6" ].join("\n")); - }); - - unit.add("header 2", function() { - var dom = fragment( - element("h1", "Heading 1 "), - element("h2", "Heading 2"), - element("h3", element("b", "Heading"), " ", element("i", "3"), " "), - element("h4", "Heading 4 with ", a("WikiStart", "WikiStart", true), " "), - element("h5", "Heading 5 "), - element("h6", "Heading 6 ")); - generateFragment.call(this, dom, [ - "!1 Heading 1 ", - "!2 Heading 2", - "!3 '''Heading''' ''3'' ", - "!4 Heading 4 with WikiStart ", - "!5 Heading 5 ", - "!6 Heading 6 " ].join("\n")); - }); - - unit.add("header with link", function() { - var dom = fragment( - element("h3", - a("http://encyclopedia.thefreedictionary.com/XUnit", "xUnit"), - ": Building the ", element("i", "Code Right"))); - generateFragment.call(this, dom, [ - "!3 [[xUnit][http://encyclopedia.thefreedictionary.com/XUnit]]: Building the ''Code Right''", - ].join("\n")); - }); - - unit.add("list", function() { - var dom = fragment( - element("p", "Paragraph"), - element("ul", - element("li", "foo bar"), - element("ul", element("li", "Subitem")), - element("li", "item 2")), - element("p", "Paragraph")); - generateFragment.call(this, dom, [ - "Paragraph", - " * foo bar", - " * Subitem", - " * item 2", - "Paragraph" ].join("\n")); - generate.call(this, dom, [ - "Paragraph", - "", - " * foo bar", - " * Subitem", - " * item 2", - "", - "Paragraph" ].join("\n")); - }); - - unit.add("list 2", function() { - var dom = fragment( - element("ul", - element("li", "foo bar"), - element("ul", - element("li", "Subitem 1"), - element("ul", - element("li", "nested item 1"), - element("li", "nested item 2")), - element("li", "Subitem 2"), - element("li", "Subitem 3")), - element("li", "item 2")), - element("p", "Paragraph")); - generateFragment.call(this, dom, [ - " * foo bar", - " * Subitem 1", - " * nested item 1", - " * nested item 2", - " * Subitem 2", - " * Subitem 3", - " * item 2", - "Paragraph", - "" ].join("\n")); - generate.call(this, dom, [ - " * foo bar", - " * Subitem 1", - " * nested item 1", - " * nested item 2", - " * Subitem 2", - " * Subitem 3", - " * item 2", - "", - "Paragraph" ].join("\n")); - }); - - unit.add("list 3", function() { - var dom = fragment( - element("ul", - element("li", "Item 1"), - element("ul", element("li", "Item 1.1")), - element("li", "Item 2")), - element("p", "And numbered lists can also be given an explicit number")); - generateFragment.call(this, dom, [ - " - Item 1", - " - Item 1.1", - " - Item 2", - "And numbered lists can also be given an explicit number" ].join("\n")); - generate.call(this, dom, [ - " * Item 1", - " * Item 1.1", - " * Item 2", - "", - "And numbered lists can also be given an explicit number" ].join("\n")); - }); - - unit.add("ordered list", function() { - var dom = fragment( - element("ol", - element("li", "foo bar"), - element("ol", element("li", "Subitem")), - element("li", "item 2"))); - generate.call(this, dom, [ - " 1 foo bar", - " 1 Subitem", - " 1 item 2" ].join("\n")); - }); - - unit.add("list at beginning of line", function() { - var dom = fragment( - element("ul", - element("li", "item 1"), - element("li", "item 2"), - element("ul", - element("li", "sub 2.1"), - element("li", "sub 2.2"))), - element("p", "a. item A b. item B Paragraph")); - generateFragment.call(this, dom, [ - "- item 1", - "- item 2", - " - sub 2.1", - " - sub 2.2", - "a. item A", - "b. item B", - "Paragraph" ].join("\n")); - generateWikitext.call(this, dom, [ - " * item 1", - " * item 2", - " * sub 2.1", - " * sub 2.2", - "", - "a. item A b. item B Paragraph" ].join("\n")); - }); - - unit.add("list + code block", function() { - var dom = fragment( - element("p", "Paragraph"), - element("ul", - element("li", - "item 1")), - element("p", - element("pre", br(), "code", br())), - element("ul", - element("li", - "item 1.1")), - element("p", - element("pre", br(), "code", br()), - element("pre", br(), "code", br())), - element("ul", - element("li", - "item 2")), - element("p", - element("pre", br(), "code", br()))); - generateFragment.call(this, dom, [ - "Paragraph", - " * item 1", - "{{{", - "code", - "}}}", - " * item 1.1", - "{{{", - "code", - "}}}", - "{{{", - "code", - "}}}", - " * item 2", - "{{{", - "code", - "}}}" ].join("\n")); - generate.call(this, dom, [ - "Paragraph", - "", - " * item 1", - "", - "{{{", - "code", - "}}}", - "", - " * item 1.1", - "", - "{{{", - "code", - "}}}{{{", - "code", - "}}}", - "", - " * item 2", - "", - "{{{", - "code", - "}}}" ].join("\n")); - }); - - unit.add("definition", function() { - var dom = fragment( - element("p", "Paragraph"), - element("p", { 'class': 'meta' }, "!define Key1 {Val1}"), - element("p", { 'class': 'meta' }, "!define Key2 {Val2 and more}"), - element("p", { 'class': 'meta' }, "!define Key3 {Val3}"), - element("p", "Paragraph")); - generateFragment.call(this, dom, [ - "Paragraph", - "!define Key1 {Val1}", - "!define Key2 {Val2 and more}", - "", - "!define Key3 {Val3}", - "Paragraph" ].join("\n")); - generate.call(this, dom, [ - "Paragraph", - "", - "!define Key1 {Val1}", - "!define Key2 {Val2 and more}", - //"", - "!define Key3 {Val3}", - //"", - "Paragraph" ].join("\n")); - }); - - unit.add("comment", function() { - var dom = fragment( - element("p", "Paragraph"), - element("p", { 'class': 'comment' }, "# comment goes here"), - element("p", { 'class': 'comment' }, "# second comment"), - element("p", " #Not a comment"), - element("p", { 'class': 'comment' }, "# third comment"), - element("p", { 'class': 'comment' }, "# | table comment |"), - element("p", "Paragraph")); - generateFragment.call(this, dom, [ - "Paragraph", - "# comment goes here", - "# second comment", - "", - " #Not a comment", - "# third comment", - "# | table comment |", - "Paragraph" ].join("\n")); - generateWikitext.call(this, dom, [ - "Paragraph", - "", - "# comment goes here", - "", - "# second comment", - "", - "#Not a comment", - "", - "# third comment", - "", - "# | table comment |", - "", - "Paragraph" ].join("\n")); - }); - - unit.add("table", function() { - var dom = fragment( - element("p", "Paragraph"), - element("table", - element("tbody", - element("tr", element("td", "1.1"), element("td", { colspan: "2" }, "1.2")), - element("tr", element("td", { colspan: "3" }, "2.1")), - element("tr", - element("td", "3.1"), - element("td", element("i", "3.2")), - element("td", element("tt", {'class': 'escape'}, "3"), " ", element("tt", {'class': 'escape'}, "*"))))), - element("p", "Paragraph")); - generateFragment.call(this, dom, [ - "Paragraph", - "|1.1|1.2|", - "|2.1", - "|3.1|''3.2''|!-3-! !-*-!", - "Paragraph" ].join("\n")); - }); - - unit.add("escaped table", function() { - var dom = fragment( - element("table", { "class": "escaped" }, - element("tbody", - element("tr", element("td", " table "), element("td", " ", element("tt", {'class': 'escape'}, "escaped"), " ")), - element("tr", element("td", " ''not italic'' "), element("td", " '''not bold''' "))))); - generate.call(this, dom, [ - "!| table | !-escaped-! |", - "| ''not italic'' | '''not bold''' |" ].join("\n")); - }); - - unit.add("table, hidden top row", function() { - var dom = fragment( - element("table", - element("tbody", - element("tr", { "class": "hidden" }, element("td", " table "), element("td", " ", element("tt", {'class': 'escape'}, "escaped"), " ")), - element("tr", element("td", " ", element("i", "italic"), " "), element("td", " ", element("b", "bold"), " "))))); - generate.call(this, dom, [ - "-| table | !-escaped-! |", - "| ''italic'' | '''bold''' |" ].join("\n")); - }); - - unit.add("escaped table, hidden top row", function() { - var dom = fragment( - element("table", { "class": "escaped" }, - element("tbody", - element("tr", { "class": "hidden" }, element("td", " table "), element("td", " ", element("tt", {'class': 'escape'}, "escaped"), " ")), - element("tr", element("td", " ''not italic'' "), element("td", " '''not bold''' "))))); - generate.call(this, dom, [ - "-!| table | !-escaped-! |", - "| ''not italic'' | '''not bold''' |" ].join("\n")); - }); - - unit.add("escaped text + table", function() { - var dom = fragment( - element("p", element("tt", { "class": "escape"}, " escaped text", br()), "| table |"), - element("table", - element("tbody", - element("tr", element("td", " table text "))))); - generateFragment.call(this, dom, [ - "!- escaped text", - "-!| table |", - "| table text |" ].join("\n")); - generateFragment.call(this, dom, [ - "!- escaped text", - "-!| table |", - "", - "| table text |" ].join("\n")); - }); - - - unit.add("table 2", function() { - var dom = fragment( - element("p", "Paragraph"), - element("table", - element("tbody", - element("tr", element("td", " 1.1 "), element("td", { colspan: "2" }, " 1.2 ")), - element("tr", element("td", { colspan: "3" }, " 2.1 ")), - element("tr", - element("td", " 3.1 "), - element("td", " ", element("i", "3.2"), " "), - element("td", " ", element("tt", {'class': 'escape'}, "3"), " ", element("tt", {'class': 'escape'}, " - "), " ")))), - element("p", "Paragraph")); - generateFragment.call(this, dom, [ - "Paragraph", - "| 1.1 | 1.2 |", - "| 2.1 |", - "| 3.1 | ''3.2'' | !-3-! !- - -! |", - "Paragraph" ].join("\n")); - generate.call(this, dom, [ - "Paragraph", - "", - "| 1.1 | 1.2 |", - "| 2.1 |", - "| 3.1 | ''3.2'' | !-3-! !- - -! |", - "", - "Paragraph" ].join("\n")); - }); - - unit.add("two tables", function() { - var dom = fragment( - element("p", "Paragraph"), - element("table", - element("tbody", - element("tr", element("td", " 1.1 "), element("td", " 1.2 ")), - element("tr", element("td", " 2.1 "), element("td", " 2.2 ")))), - element("p", ""), - element("table", - element("tbody", - element("tr", element("td", " 3.1 "), element("td", " 3.2 ")), - element("tr", element("td", " 4.1 "), element("td", " 4.2 "))))); - generate.call(this, dom, [ - "Paragraph", - "", - "| 1.1 | 1.2 |", - "| 2.1 | 2.2 |", - "", - "| 3.1 | 3.2 |", - "| 4.1 | 4.2 |" ].join("\n")); - }); - - unit.add("table + rule", function() { - var dom = fragment( - element("table", - element("tbody", element("tr", element("td", " 1st ")))), - element("p", element("b", "bold")), - element("table", - element("tbody", element("tr", element("td", " 2nd ")))), - element("p", element("tt", {'class': 'escape'}, "'''normal"))); - generate.call(this, dom, [ - "| 1st |", - "", - "'''bold'''", - "", - "| 2nd |", - "", - "!-'''normal-!" ].join("\n")); - }); - - unit.add("table [ paragraph, ul ]", function() { - var dom = fragment( - element("table", - element("tbody", - element("tr", - element("td", element("p", "1.1")), - element("td", - element("ul", - element("li", "item 1"), - element("li", "item 2")))), - element("tr", - element("td", - element("p", "2.1* item 3 * item 4") - ))))); - generateWikitext.call(this, dom, [ - "| 1.1 | * item 1\n * item 2 |", - "| 2.1* item 3 * item 4 |" ].join("\n")); - }); - - unit.add("table with incomplete markups", function() { - var dom = fragment( - element("table", - element("tbody", - element("tr", - element("td", " ", element("b", element("i", "' "))), - element("td", " ", element("b", "bold"), " ")) - ) - ) - ); - generateFragment.call(this, dom, "| '''''' | '''bold''' |"); - }); - - unit.add("table with links", function() { - var dom = fragment( - element("table", - element("tbody", - element("tr", - element("td", { 'colspan': '2' }, " ", element("b", "To Learn More..."), " ")), - element("tr", - element("td", " ", a("FitNesse.UserGuide.OneMinuteDescription", "A One-Minute Description"), " "), - element("td", " ", element("i", "What is ", a("FitNesse.FitNesse", "FitNesse"), "? Start here."), " ")), - element("tr", - element("td", " ", a("FitNesse.UserGuide.TwoMinuteExample", "A Two-Minute Example"), " "), - element("td", " ", element("i", "A brief example. Read this one next."), " ")) - ))); - generate.call(this, dom, [ - "| '''To Learn More...''' |", - "| [[A One-Minute Description][FitNesse.UserGuide.OneMinuteDescription]] | ''What is [[FitNesse][FitNesse.FitNesse]]? Start here.'' |", - "| [[A Two-Minute Example][FitNesse.UserGuide.TwoMinuteExample]] | ''A brief example. Read this one next.'' |" ].join("\n")); - }); - - - - unit.add("table from word", function() { - var dom = element("body"); - dom.innerHTML = [ - '', - '', - ' ', - ' ', - ' ', - ' ', - ' ', - ' ', - ' ', - ' ', - '
            ', - '

            a

            ', - '

            b

            ', - '             		', - '', - '

            b

            ', - '
            ', - '

            c

            ', - '             		', - '', - '

            d

            ', - '
            ', - '' ].join("\n"); - generateWikitext.call(this, dom, [ - "| a\n\nb | b |", - "| c | d |" ].join("\n")); - }); - - unit.add("domToWikitext for code block", function() { - var br = function() { return element("br") }; - var dom = fragment( - element("h1", "Heading", br(), "1"), - element("h2", "Heading", br(), "2"), - element("h3", "Heading", br(), "3"), - element("h4", "Heading", br(), "4"), - element("h5", "Heading", br(), "5"), - element("h6", "Heading", br(), "6"), - element("p", - "var Wysiwyg = function(textarea) {", " ... ", "}"), - element("p", "> citation continued"), - element("p", "quote continued"), - element("ul", - element("li", "item 1", br(), "continued"), - element("ol", element("li", "item", br(), "1.1"))), - element("p", { 'class': 'meta' }, "!define def {dt dd}"), - element("table", - element("tbody", - element("tr", - element("td", "cell", br(), "1"), - element("th", "cell", br(), "2"))))); - var wikitext = instance.domToWikitext(dom, { formatCodeBlock: true }); - this.assertEqual([ - "!1 Heading 1", - "!2 Heading 2", - "!3 Heading 3", - "!4 Heading 4", - "!5 Heading 5", - "!6 Heading 6", - "var Wysiwyg = function(textarea) { ... }", - "", - "> citation continued", - "", - "quote continued", - "", - " * item 1 continued", - " 1 item 1.1", - "", - "!define def {dt dd}", - "| cell 1 | cell 2 |", - "" ].join("\n"), wikitext); - }); - - unit.add("selectRange", function() { - var d = instance.contentDocument; - function _element() { - var args = [ d ]; - args.push.apply(args, arguments); - return element.apply(this, args); - } - function _text() { - var args = [ d ]; - args.push.apply(args, arguments); - return text.apply(this, args); - } - function assertRangeText(expected, start, startOffset, end, endOffset) { - instance.selectRange(start, startOffset, end, endOffset); - if (expected instanceof RegExp) { - unit.assertMatch(expected, instance.getSelectionText()); - } - else { - unit.assertEqual(expected, instance.getSelectionText()); - } - } - var body = d.body; - while (body.childNodes.length > 0) { - body.removeChild(body.lastChild); - } - body.appendChild(fragment(d, - _element("p", - "The", " quick", " brown", - _element("b", " fox", " jumps", " over"), - " the", " lazy", " dog."), - _element("p", "Brick ", "quiz ", "whangs ", "jumpy ", "veldt ", "fox."))); - - var paragraph1 = body.childNodes[0]; - var paragraph2 = body.childNodes[1]; - var bold = paragraph1.childNodes[3]; - assertRangeText("The", paragraph1.childNodes[0], 0, paragraph1.childNodes[0], 3); - assertRangeText("he", paragraph1.childNodes[0], 1, paragraph1.childNodes[0], 3); - assertRangeText("e quick brow", paragraph1.childNodes[0], 2, paragraph1.childNodes[2], 5); - assertRangeText("ick brown", paragraph1.childNodes[1], 3, paragraph1.childNodes[2], 6); - assertRangeText("ick brown fox j", paragraph1.childNodes[1], 3, bold.childNodes[1], 2); - assertRangeText("ver the laz", bold.childNodes[2], 2, paragraph1.childNodes[5], 4); - assertRangeText(" the lazy", paragraph1.childNodes[4], 0, paragraph1.childNodes[5], 5); - assertRangeText("lazy dog.", paragraph1.childNodes[5], 1, paragraph1.childNodes[6], 5); - assertRangeText(/^fox jumps over the lazy dog\.[\r\n]*Brick quiz whangs$/, - bold.childNodes[0], 1, paragraph2.childNodes[2], 6); - assertRangeText(" fox jumps over", paragraph1, 3, paragraph1, 4); - assertRangeText(" dog.", paragraph1, 6, paragraph1, 7); - assertRangeText("", paragraph1, 7, paragraph1, 7); - assertRangeText("quick brown fox jumps over", paragraph1.childNodes[1], 1, paragraph1, 4); - assertRangeText(" fox jumps over t", paragraph1, 3, paragraph1.childNodes[4], 2); - }); - - unit.add("Collapsible area", function() { - var dom = fragment( - element("div", { "class": "collapsable" }, - element("p", "My content")), - element("p", br())); - generateFragment.call(this, dom, [ - "!*", - "My content", - "*!"].join("\n")); - generateWikitext.call(this, dom, [ - "!*** My content", - "", - "*!"].join("\n")); - }); - - unit.add("Collapsible area with only title", function() { - dom = fragment( - element("div", { "class": "collapsable" }, - element("p", "My content"), - element("p", br())), - element("p", br())); - generateFragment.call(this, dom, [ - "!* My content", - "", - "*!"].join("\n")); - generateWikitext.call(this, dom, [ - "!*** My content", - "", - "*!"].join("\n")); - }); - - unit.add("Collapsible area styles", function() { - var dom = fragment( - element("div", { "class": "collapsable" }, - element("p", "EXPANDED"), - element("p", br()), - element("p", "Expanded content")), - element("p", br()), - element("div", { "class": "collapsable collapsed" }, - element("p", "COLLAPSED"), - element("p", br()), - element("p", "Collapsed content")), - element("p", br()), - element("div", { "class": "collapsable hidden" }, - element("p", "HIDDEN"), - element("p", br()), - element("p", "Hidden content")), - element("p", br())); - generate.call(this, dom, [ - "!*** EXPANDED", - "", - "Expanded content", - "", - "*!", - "!***> COLLAPSED", - "", - "Collapsed content", - "", - "*!", - "!***< HIDDEN", - "", - "Hidden content", - "", - "*!"].join("\n")); - }); - - unit.add("Nested collapsible area", function() { - var dom = fragment( - element("p", "Paragraph"), - element("div", { "class": "collapsable" }, - element("p", "outer"), - element("p", "Text"), - element("div", { "class": "collapsable" }, - element("p", "inner"), - element("p", "More text") - ), - element("p", br())), - element("p", br())); - generateFragment.call(this, dom, [ - "Paragraph", - "!*** outer", - "Text", - "!*** inner", - "More text", - "*!", - "*!"].join("\n")); - generateWikitext.call(this, dom, [ - "Paragraph", - "", - "!*** outer", - "", - "Text", - "", - "!*** inner", - "", - "More text", - "", - "*!", - "*!"].join("\n")); - }); - - unit.add("Collapsible area with table", function() { - var dom = fragment( - element("div", { "class": "collapsable" }, - element("p", "title"), - element("p", "Text"), - element("table", - element('tbody', - element('tr', - element('td', ' table '), - element('td', ' row ')))), - element("p", "More text") - ), - element("p", br())); - generateFragment.call(this, dom, [ - "!*** title", - "Text", - "| table | row |", - "More text", - "*!"].join("\n")); - generateWikitext.call(this, dom, [ - "!*** title", - "", - "Text", - "", - "| table | row |", - "", - "More text", - "", - "*!"].join("\n")); - }); - - unit.add("Collapsible area with header", function() { - var dom = fragment( - element("div", { "class": "collapsable" }, - element("p", "title"), - element("p", br()), - element("h2", "Header"), - element("p", "More text") - ), - element("p", br())); - generateFragment.call(this, dom, [ - "!*** title", - "!2 Header", - "More text", - "*!"].join("\n")); - generateWikitext.call(this, dom, [ - "!*** title", - "", - "!2 Header", - "More text", - "", - "*!"].join("\n")); - }); - - unit.add("Collapsible area with list", function() { - var dom = fragment( - element("div", { "class": "collapsable" }, - element("p", "title"), - element("p", "Text"), - element("ul", - element("li", "item 1"), - element("li", "item 2")), - element("p", "More text") - ), - element("p", br())); - generateFragment.call(this, dom, [ - "!*** title", - "Text", - " * item 1", - " * item 2", - "More text", - "*!"].join("\n")); - generateWikitext.call(this, dom, [ - "!*** title", - "", - "Text", - "", - " * item 1", - " * item 2", - "", - "More text", - "", - "*!"].join("\n")); - }); - - unit.add("table with escaped content", function() { - var dom = fragment( - element("table", - element("tbody", - element("tr", - element("td", "sql") - ), element("tr", - element("td", - element("tt", { "class": "escape" }, " SELECT *", br(), " FROM bar", br()), br() - ) - ) - ) - )); - generateFragment.call(this, dom, [ - "|sql|", - "|!- SELECT *", - " FROM bar", - "-!|", - ""].join("\n")); - generateWikitext.call(this, dom, "| sql |\n| !- SELECT *\n FROM bar\n-! |"); - }); - - unit.add("table with preformatted, escaped content", function() { - var dom = fragment( - element("table", - element("tbody", - element("tr", - element("td", "sql") - ), element("tr", - element("td", - element("pre", - element("tt", { "class": "escape" }, " SELECT *", br(), " FROM bar", br()) - ) - ) - ) - ) - )); - generateFragment.call(this, dom, [ - "|sql|", - "|{{{!- SELECT *", - " FROM bar", - "-!}}}|", - ""].join("\n")); - }); - - unit.run(); - } - - var button = document.createElement("button"); - button.innerHTML = "run »"; - button.style.textDecoration = "underline"; - document.body.appendChild(button); - $(button).click(run); - button.focus(); -}); -// vim:et:ai:sw=4 +$(function() { + Wysiwyg.paths = { base: ".", stylesheets: [] }; + var options = Wysiwyg.getOptions(); + var instance = new Wysiwyg(document.getElementById("textarea"), options); + var contentDocument = instance.contentDocument; + + // Ensure the wysiwyg editor is visible + $('#editor-wysiwyg-1').click(); + + var d = document; + var wysiwygHtml = d.getElementById("wysiwyg-html"); + var showWysiwygHtml = d.getElementById("show-wysiwyg-html"); + setTimeout(function() { + if (showWysiwygHtml.checked) { + var body = contentDocument.body; + var browserIE = body.attachEvent ? true : false; + var elements = body.getElementsByTagName("br"); + var count = 0; + var html = body.innerHTML.replace(/<[Bb][Rr] *[^>\/]*/g, function(value) { + var element = elements[count++]; + var attributes = element.attributes; + var length = attributes.length; + if (length == 0) + return value; + var texts = [ value ]; + for (var i = 0; i < length; i++) { + var attr = attributes[i]; + if (!browserIE || !!element[attr.name]) { + texts.push(' ', attr.name, '="', attr.value, '"'); + } + } + return texts.join(""); + }); + if (wysiwygHtml.value != html) { + wysiwygHtml.value = html; + } + } + setTimeout(arguments.callee, 500); + }, 500); + + function generate(dom, wikitext, options, withoutDomToWikitext, withoutWikitextToFragment) { + dom = dom.cloneNode(true); + var anonymous = dom.ownerDocument.createElement("div"); + anonymous.appendChild(dom); + + if (!withoutWikitextToFragment) { + var fragment = instance.wikitextToFragment(wikitext, contentDocument, options); + var generated = contentDocument.createElement("div"); + generated.appendChild(fragment); + var generatedHtml = generated.innerHTML; + if (!generated.addEventListener || window.opera) { + generatedHtml = generatedHtml.replace(/\n\r/g, "\uffff").replace(/\uffff\n?/g, "\n"); + } + this.assertEqual(anonymous.innerHTML, generatedHtml, "wikitextToFragment"); + } + if (!withoutDomToWikitext) { + this.assertEqual(wikitext + "\n", instance.domToWikitext(anonymous, options), "domToWikitext"); + } + } + + function generateFragment(dom, wikitext, options) { + generate.call(this, dom, wikitext, options, true, false); + } + + function generateWikitext(dom, wikitext, options) { + generate.call(this, dom, wikitext, options, false, true); + } + + function run() { + var unit = new Wysiwyg.TestUnit(); + var fragment = unit.fragment; + var element = unit.element; + var br = function() { return element("br") }; + var a = function(link, label, autolink) { + var attrs = { + href: link, + title: link, + 'data-wysiwyg-link': link }; + if (autolink) { + attrs['data-wysiwyg-autolink'] = 'true'; + } + return element("a", attrs, label || link); + }; + + unit.add("treeWalk", function() { + var list; + function iterator(node) { + var value; + if (node) { + switch (node.nodeType) { + case 1: value = node.tagName.toLowerCase(); break; + case 3: value = "#text"; break; + } + } + else { + value = "(null)"; + } + list.push(value); + } + + function doTreeWalk(expected, dom) { + list = []; + instance.treeWalk(dom, iterator); + this.assertEqual(expected, list.join(" ")); + + list = []; + instance._treeWalkEmulation(dom, iterator); + this.assertEqual(expected, list.join(" ")); + } + + doTreeWalk.call(this, "p #text (null)", element("div", element("p", "paragraph"))); + doTreeWalk.call(this, "#text (null)", element("div", element("p", "paragraph")).firstChild); + doTreeWalk.call(this, "(null)", element("div", element("p")).firstChild); + + var dom = element("div"); + dom.innerHTML = [ + '

            Tables

            ', + '

            ', + 'Simple tables can be created like this:', + '

            ', + '
            ||Cell 1||Cell 2||Cell 3||',
+                '||Cell 4||Cell 5||Cell 6||',
+                '

            ', + 'Display:', + '

            ', + '', + '
            Cell 1Cell 2Cell 3', + '
            Cell 4Cell 5Cell 6', + '
            ', + '

            ', + 'Note that more complex tables can be created using', + 'reStructuredText.', + '

            ' ].join(""); + var expected = [ + 'h2', '#text', 'p', '#text', 'pre', '#text', 'p', '#text', + 'table', 'tbody', + 'tr', 'td', '#text', 'td', '#text', 'td', '#text', + 'tr', 'td', '#text', 'td', '#text', 'td', '#text', + 'p', '#text', 'a', '#text', 'em', '#text', '#text', '#text', + '(null)'].join(" "); + doTreeWalk.call(this, expected, dom); + }); + + unit.add("isLastChildInBlockNode", function() { + var dom = fragment( + element("p", element("br")), + element("p", "foobar", element("br"), "foobar"), + element("p", element("b", "foobar", element("br"))), + element("p", element("b", "foobar"), element("br")), + element("br")); + var count = 0; + function assert(expected, node) { + this.assertEqual(expected, instance.isLastChildInBlockNode(node), "#" + (count++)); + } + assert.call(this, true, dom.childNodes[0].childNodes[0]); + assert.call(this, false, dom.childNodes[1].childNodes[0]); + assert.call(this, false, dom.childNodes[1].childNodes[1]); + assert.call(this, true, dom.childNodes[1].childNodes[2]); + assert.call(this, false, dom.childNodes[2].childNodes[0].childNodes[0]); + assert.call(this, true, dom.childNodes[2].childNodes[0].childNodes[1]); + assert.call(this, false, dom.childNodes[3].childNodes[0].childNodes[0]); + assert.call(this, true, dom.childNodes[3].childNodes[1]); + assert.call(this, true, dom.childNodes[4]); + }); + + unit.add("code block", function() { + var dom = fragment( + element("p", "`abc`"), + element("p", element("pre", br(), "{{{code-block", br()))); + var wikitext = [ + "`abc`", + "", + "{{{", + "{{{code-block", + "}}}" ].join("\n"); + generate.call(this, dom, wikitext); + }); + unit.add("code block nest", function() { + var dom = fragment( + element("p", element("pre", br(), "#!python", br(), "= level 1", br(), "{{{", br(), "= level 2", br()), " = level 1}}}")); + var wikitext = [ + "{{{", + "#!python", + "= level 1", + "{{{", + "= level 2", + "}}}", + "= level 1", + "}}}" ].join("\n"); + generateFragment.call(this, dom, wikitext); + generateWikitext.call(this, dom, [ + "{{{", + "#!python", + "= level 1", + "{{{", + "= level 2", + "}}}= level 1}}}" ].join("\n")); + }); + + unit.add("code block with empty lines", function() { + var dom = fragment( + element("p", "test:", + element("pre", br(), "first line", br(), br(), " second line "))); + var wikitext = [ + "test:{{{", + "first line", + "", + " second line }}}" ].join("\n"); + generate.call(this, dom, wikitext); + }); + + unit.add("paragraph", function() { + var dom = fragment( + element("p", "Paragraph continued..."), + element("p", "Second paragraph continued...")); + generateFragment.call(this, dom, [ + "Paragraph", + "continued...", + "", + "Second paragraph", + "continued...", + "" ].join("\n")); + generate.call(this, dom, [ + "Paragraph continued...", + "", + "Second paragraph continued..." ].join("\n")); + }); + + unit.add("link", function() { + var dom = fragment( + element("p", a("LinkPage", "LinkPage", true))); + generate.call(this, dom, + "LinkPage"); + }); + + unit.add("link with markup", function() { + var dom = fragment( + element("p", a("LinkPage", element("i", "label")))); + generate.call(this, dom, + "[[''label''][LinkPage]]"); + }); + + unit.add("link with hash", function() { + var dom = fragment( + element("p", a("LinkPage#foo", "label"))); + generate.call(this, dom, + "[[label][LinkPage#foo]]"); + }); + + unit.add("link with parameter", function() { + var dom = fragment( + element("p", a("LinkPage?edit&test", "label"))); + generate.call(this, dom, + "[[label][LinkPage?edit&test]]"); + }); + + unit.add("wiki macros", function() { + var dom = fragment( + element("table", element("tbody", + element("tr", element("td", "!c !2 Contents")), + element("tr", element("td", "!contents -g")))), + element("p", { 'class': 'meta' }, "!path fitnesse.jar"), + element("p", { 'class': 'meta' }, "!path classes")); + generateFragment.call(this, dom, [ + "|!c !2 Contents|", + "|!contents -g|", + "", + "!path fitnesse.jar", + "!path classes" ].join("\n")); + }); + + unit.add("hr", function() { + var dom = fragment( + element("p", "Paragraph"), + element("hr"), + element("p", "Another paragraph"), + element("hr")); + generateFragment.call(this, dom, [ + "Paragraph", + "----", + "Another paragraph", + "----" ].join("\n")); + generate.call(this, dom, [ + "Paragraph", + "", + "----", + "Another paragraph", + "", + "----" ].join("\n")); + }); + + unit.add("escape !- .. -! - literal escape", function() { + var dom = element("p", "foo ", element("tt", {'class': 'escape'}, "bar"), " baz"); + var wikitext = "foo !-bar-! baz"; + generate.call(this, dom, wikitext); + }); + + unit.add("escape !< .. >! - html escape", function() { + var dom = element("p", "foo ", element("tt", {'class': 'htmlescape'}, "bar"), " baz"); + var wikitext = "foo !! baz"; + generate.call(this, dom, wikitext); + }); + + unit.add("escape !{ .. }! - hashtable", function() { + var dom = element("p", "foo ", element("tt", {'class': 'hashtable'}, "bar: val"), " baz"); + var wikitext = "foo !{bar: val}! baz"; + generate.call(this, dom, wikitext); + }); + + unit.add("escape !( .. )! - nested ", function() { + var dom = element("p", "foo ", element("tt", {'class': 'nested'}, "bar"), " baz"); + var wikitext = "foo !(bar)! baz"; + generate.call(this, dom, wikitext); + }); + + unit.add("escape ![ .. ]! - plain text table", function() { + var dom = element("p", "foo ", element("tt", {'class': 'plaintexttable'}, "bar", br(), "baz"), " bee"); + var wikitext = "foo ![bar\nbaz]! bee"; + generate.call(this, dom, wikitext); + }); + + unit.add("bold italic", function() { + var dom = element("p", element("b", element("i", "bold italic"))); + var wikitext = "'''''bold italic'''''"; + generate.call(this, dom, wikitext); + }); + + unit.add("bold", function() { + var wikitext = [ + "The quick '''brown''' fox.", + "", + "The quick '''brown''' fox." ].join("\n"); + generateWikitext.call(this, + fragment( + element("p", "The quick ", element("b", "brown"), " fox."), + element("p", "The quick ", element("strong", "brown"), " fox.")), + wikitext); + generateFragment.call(this, + fragment( + element("p", "The quick ", element("b", "brown"), " fox."), + element("p", "The quick ", element("b", "brown"), " fox.")), + wikitext); + }); + unit.add("italic", function() { + var wikitext = [ + "The quick ''brown'' fox.", + "", + "The quick ''brown'' fox." ].join("\n"); + generateWikitext.call(this, + fragment( + element("p", "The quick ", element("i", "brown"), " fox."), + element("p", "The quick ", element("em", "brown"), " fox.")), + wikitext); + generateFragment.call(this, + fragment( + element("p", "The quick ", element("i", "brown"), " fox."), + element("p", "The quick ", element("i", "brown"), " fox.")), + wikitext); + }); + unit.add("strike-through", function() { + var dom = element("p", element("strike", "strike-through")); + var wikitext = "--strike-through--"; + generate.call(this, dom, wikitext); + }); + unit.add("code", function() { + var dom = element("p", "`monospace`", + ", ", element("pre", "mono`s`pace"), + ", ", "`mono", element("pre", "s"), "pace`"); + var wikitext = "`monospace`, {{{mono`s`pace}}}, `mono{{{s}}}pace`"; + generateFragment.call(this, dom, "`monospace`, {{{mono`s`pace}}}, `mono{{{s}}}pace`"); + generateWikitext.call(this, dom, "`monospace`,{{{mono`s`pace}}}, `mono{{{s}}}pace`"); + }); + unit.add("escaped !-..-!", function() { + var dom = element("p", "`monospace`", + ", ", element("tt", {'class': 'escape'}, "mono`s`pace"), + ", ", "`mono", element("tt", {'class': 'escape'}, "s"), "pace`", + ", ", element("tt", {'class': 'escape'}, "
            • list item
            ")); + generate.call(this, dom, "`monospace`, !-mono`s`pace-!, `mono!-s-!pace`, !-
            • list item
            -!"); + }); + unit.add("italic -> bold", function() { + var dom = element("p", + "normal", + element("i", "italic"), + element("b", "bold"), + "normal"); + var wikitext = "normal''italic'''''bold'''normal"; + generate.call(this, dom, wikitext); + }); + unit.add("bold -> italic", function() { + var dom = element("p", + "normal", + element("b", "bold"), + element("i", "italic"), + "normal"); + var wikitext = "normal'''bold'''''italic''normal"; + generate.call(this, dom, wikitext); + }); + unit.add("[ italic [ xyz ] bold ]", function() { + var dom = element("p", + "normal", + element("i", "italic", element("b", "xyz")), + element("b", "bold"), + "normal"); + var wikitext = "normal''italic'''xyz''bold'''normal"; + generate.call(this, dom, wikitext); + }); + unit.add("overlapped markups", function() { + var dom = element("p", + "normal", + element("b", "bold", + element("i", "italic", + element("strike", "strike-through")), + "sub"), + "."); + var wikitext = "normal'''bold''italic--strike-through--''sub'''."; + generateFragment.call(this, dom, wikitext); + }); + unit.add("repeated markups", function() { + generateWikitext.call(this, + element("p", "ab", element("b", "cd"), element("b", "ef"), "gh"), + "ab'''cdef'''gh"); + generateWikitext.call(this, + element("p", "ab", element("i", "cd"), element("i", "ef"), "gh"), + "ab''cdef''gh"); + generateWikitext.call(this, + element("p", "ab", + element("i", element("b", "cd")), + element("b", element("i", "ef")), + "gh"), + "ab'''''cdef'''''gh"); + }); + unit.add("markups without text", function() { + generateWikitext.call(this, + element("p", "abc", element("b", ""), "def"), + "abcdef"); + generateWikitext.call(this, + element("p", "abc", element("i", ""), "def"), + "abcdef"); + generateWikitext.call(this, + element("p", "abc", element("tt", ""), "def"), + "abcdef"); + generateWikitext.call(this, + element("p", "abc", element("b", element("i", "")), "def"), + "abcdef"); + generateWikitext.call(this, + element("p", "abc", element("i", element("b", "")), "def"), + "abcdef"); + }); + + unit.add("! bold italic", function() { + var dom = element("p", element("b", element("i", "bold", + element("tt", {'class': 'escape'}, "'''''"), " italic")), "."); + var wikitext = "'''''bold!-'''''-! italic'''''."; + generate.call(this, dom, wikitext); + }); + unit.add("! bold", function() { + var dom = element("p", element("b", "bold", element("tt", {'class': 'escape'}, "'''"), " bold"), "."); + var wikitext = "'''bold!-'''-! bold'''."; + generate.call(this, dom, wikitext); + }); + unit.add("! italic", function() { + var dom = element("p", element("i", "italic", element("tt", {'class': 'escape'}, "''"), " italic"), "."); + var wikitext = "''italic!-''-! italic''."; + generate.call(this, dom, wikitext); + }); + unit.add("! strike-through", function() { + var dom = element("p", element("strike", "strike", element("tt", {'class': 'escape'}, "--"), "through"), "."); + var wikitext = "--strike!----!through--."; + generate.call(this, dom, wikitext); + }); + unit.add("! monospace", function() { + var dom = element("p", element("tt", {'class': 'escape'}, "{{{monospace}}}"), " or ", + element("tt", {'class': 'escape'}, "`monospace`")); + var wikitext = "!-{{{monospace}}}-! or !-`monospace`-!"; + generate.call(this, dom, wikitext); + }); + + unit.add("multiline escape", function() { + var dom = element("p", element("tt", {'class': 'escape'}, "escaped", br(), "\"quoted line\"", br()), br()); + var wikitext = [ + "!-escaped", + "\"quoted line\"", + "-!" ].join("\n"); + generate.call(this, dom, wikitext); + }); + + unit.add("multiline escape 2", function() { + var dom = element("p", {"class": "meta"}, "!define var (", element("tt", {'class': 'escape'}, "escaped", br(), "line", br(), "123", br()), ")"); + var wikitext = [ + "!define var (!-escaped", + "line", + "123", + "-!)" ].join("\n"); + generate.call(this, dom, wikitext); + }); + + unit.add("WikiPageName", function() { + var dom = fragment( + element("p", + a("CamelCase", "CamelCase", true), + " ", element("tt", {'class': 'escape'}, "CamelCase"), " ", + a("FooBarA", "FooBarA", true), " FOo ", + a("FoobarA", "FoobarA", true), " ", + a("ChildLink", ">ChildLink", true), " ", + a(".AbsoluteLink", ".AbsoluteLink", true), " ", + a(".AbsoluteLink.WikiPage", ".AbsoluteLink.WikiPage", true), + " OneÅngström Oneångström setTextColor")); + generateFragment.call(this, dom, + "CamelCase !-CamelCase-! FooBarA FOo FoobarA ChildLink .AbsoluteLink .AbsoluteLink.WikiPage OneÅngström Oneångström setTextColor"); + }); + + unit.add("links2wiki", function() { + var dom = fragment( + element("p", + a("TestPage", "label"), + a("TestPage", "läbel"), + a("TestPage", "TestPage", true), + a("FrontPage?edit", "Edit"), + " button and add a ", + a("FitNesse.UserGuide.WikiWord", element("tt", {'class': 'escape'}, "WikiWord")), + a("http://external.link/bladieblah", "bla") + )); + + var wikitext = "[[label][TestPage]]" + + "[[läbel][TestPage]]" + + "TestPage" + + "[[Edit][FrontPage?edit]] button and add a [[!-WikiWord-!][FitNesse.UserGuide.WikiWord]]" + + "[[bla][http://external.link/bladieblah]]"; + + // should go both ways (wiki2html and html2wiki) + generate.call(this, dom, wikitext); + //generateFragment.call(this, dom, wikitext); + }); + + unit.add("header", function() { + var dom = fragment( + element("h1", "Heading 1"), + element("h2", "Heading 2"), + element("h3", element("b", "Heading"), " ", element("i", "3")), + element("h4", "Heading 4 with ", a("WikiStart", "WikiStart", true)), + element("h5", "Heading 5"), + element("h6", "Heading 6")); + generate.call(this, dom, [ + "!1 Heading 1", + "!2 Heading 2", + "!3 '''Heading''' ''3''", + "!4 Heading 4 with WikiStart", + "!5 Heading 5", + "!6 Heading 6" ].join("\n")); + }); + + unit.add("header 2", function() { + var dom = fragment( + element("h1", "Heading 1 "), + element("h2", "Heading 2"), + element("h3", element("b", "Heading"), " ", element("i", "3"), " "), + element("h4", "Heading 4 with ", a("WikiStart", "WikiStart", true), " "), + element("h5", "Heading 5 "), + element("h6", "Heading 6 ")); + generateFragment.call(this, dom, [ + "!1 Heading 1 ", + "!2 Heading 2", + "!3 '''Heading''' ''3'' ", + "!4 Heading 4 with WikiStart ", + "!5 Heading 5 ", + "!6 Heading 6 " ].join("\n")); + }); + + unit.add("header with link", function() { + var dom = fragment( + element("h3", + a("http://encyclopedia.thefreedictionary.com/XUnit", "xUnit"), + ": Building the ", element("i", "Code Right"))); + generateFragment.call(this, dom, [ + "!3 [[xUnit][http://encyclopedia.thefreedictionary.com/XUnit]]: Building the ''Code Right''", + ].join("\n")); + }); + + unit.add("list", function() { + var dom = fragment( + element("p", "Paragraph"), + element("ul", + element("li", "foo bar"), + element("ul", element("li", "Subitem")), + element("li", "item 2")), + element("p", "Paragraph")); + generateFragment.call(this, dom, [ + "Paragraph", + " * foo bar", + " * Subitem", + " * item 2", + "Paragraph" ].join("\n")); + generate.call(this, dom, [ + "Paragraph", + "", + " * foo bar", + " * Subitem", + " * item 2", + "", + "Paragraph" ].join("\n")); + }); + + unit.add("list 2", function() { + var dom = fragment( + element("ul", + element("li", "foo bar"), + element("ul", + element("li", "Subitem 1"), + element("ul", + element("li", "nested item 1"), + element("li", "nested item 2")), + element("li", "Subitem 2"), + element("li", "Subitem 3")), + element("li", "item 2")), + element("p", "Paragraph")); + generateFragment.call(this, dom, [ + " * foo bar", + " * Subitem 1", + " * nested item 1", + " * nested item 2", + " * Subitem 2", + " * Subitem 3", + " * item 2", + "Paragraph", + "" ].join("\n")); + generate.call(this, dom, [ + " * foo bar", + " * Subitem 1", + " * nested item 1", + " * nested item 2", + " * Subitem 2", + " * Subitem 3", + " * item 2", + "", + "Paragraph" ].join("\n")); + }); + + unit.add("list 3", function() { + var dom = fragment( + element("ul", + element("li", "Item 1"), + element("ul", element("li", "Item 1.1")), + element("li", "Item 2")), + element("p", "And numbered lists can also be given an explicit number")); + generateFragment.call(this, dom, [ + " - Item 1", + " - Item 1.1", + " - Item 2", + "And numbered lists can also be given an explicit number" ].join("\n")); + generate.call(this, dom, [ + " * Item 1", + " * Item 1.1", + " * Item 2", + "", + "And numbered lists can also be given an explicit number" ].join("\n")); + }); + + unit.add("ordered list", function() { + var dom = fragment( + element("ol", + element("li", "foo bar"), + element("ol", element("li", "Subitem")), + element("li", "item 2"))); + generate.call(this, dom, [ + " 1 foo bar", + " 1 Subitem", + " 1 item 2" ].join("\n")); + }); + + unit.add("list at beginning of line", function() { + var dom = fragment( + element("ul", + element("li", "item 1"), + element("li", "item 2"), + element("ul", + element("li", "sub 2.1"), + element("li", "sub 2.2"))), + element("p", "a. item A b. item B Paragraph")); + generateFragment.call(this, dom, [ + "- item 1", + "- item 2", + " - sub 2.1", + " - sub 2.2", + "a. item A", + "b. item B", + "Paragraph" ].join("\n")); + generateWikitext.call(this, dom, [ + " * item 1", + " * item 2", + " * sub 2.1", + " * sub 2.2", + "", + "a. item A b. item B Paragraph" ].join("\n")); + }); + + unit.add("list + code block", function() { + var dom = fragment( + element("p", "Paragraph"), + element("ul", + element("li", + "item 1")), + element("p", + element("pre", br(), "code", br())), + element("ul", + element("li", + "item 1.1")), + element("p", + element("pre", br(), "code", br()), + element("pre", br(), "code", br())), + element("ul", + element("li", + "item 2")), + element("p", + element("pre", br(), "code", br()))); + generateFragment.call(this, dom, [ + "Paragraph", + " * item 1", + "{{{", + "code", + "}}}", + " * item 1.1", + "{{{", + "code", + "}}}", + "{{{", + "code", + "}}}", + " * item 2", + "{{{", + "code", + "}}}" ].join("\n")); + generate.call(this, dom, [ + "Paragraph", + "", + " * item 1", + "", + "{{{", + "code", + "}}}", + "", + " * item 1.1", + "", + "{{{", + "code", + "}}}{{{", + "code", + "}}}", + "", + " * item 2", + "", + "{{{", + "code", + "}}}" ].join("\n")); + }); + + unit.add("definition", function() { + var dom = fragment( + element("p", "Paragraph"), + element("p", { 'class': 'meta' }, "!define Key1 {Val1}"), + element("p", { 'class': 'meta' }, "!define Key2 {Val2 and more}"), + element("p", { 'class': 'meta' }, "!define Key3 {Val3}"), + element("p", "Paragraph")); + generateFragment.call(this, dom, [ + "Paragraph", + "!define Key1 {Val1}", + "!define Key2 {Val2 and more}", + "", + "!define Key3 {Val3}", + "Paragraph" ].join("\n")); + generate.call(this, dom, [ + "Paragraph", + "", + "!define Key1 {Val1}", + "!define Key2 {Val2 and more}", + //"", + "!define Key3 {Val3}", + //"", + "Paragraph" ].join("\n")); + }); + + unit.add("comment", function() { + var dom = fragment( + element("p", "Paragraph"), + element("p", { 'class': 'comment' }, "# comment goes here"), + element("p", { 'class': 'comment' }, "# second comment"), + element("p", " #Not a comment"), + element("p", { 'class': 'comment' }, "# third comment"), + element("p", { 'class': 'comment' }, "# | table comment |"), + element("p", "Paragraph")); + generateFragment.call(this, dom, [ + "Paragraph", + "# comment goes here", + "# second comment", + "", + " #Not a comment", + "# third comment", + "# | table comment |", + "Paragraph" ].join("\n")); + generateWikitext.call(this, dom, [ + "Paragraph", + "", + "# comment goes here", + "", + "# second comment", + "", + "#Not a comment", + "", + "# third comment", + "", + "# | table comment |", + "", + "Paragraph" ].join("\n")); + }); + + unit.add("table", function() { + var dom = fragment( + element("p", "Paragraph"), + element("table", + element("tbody", + element("tr", element("td", "1.1"), element("td", { colspan: "2" }, "1.2")), + element("tr", element("td", { colspan: "3" }, "2.1")), + element("tr", + element("td", "3.1"), + element("td", element("i", "3.2")), + element("td", element("tt", {'class': 'escape'}, "3"), " ", element("tt", {'class': 'escape'}, "*"))))), + element("p", "Paragraph")); + generateFragment.call(this, dom, [ + "Paragraph", + "|1.1|1.2|", + "|2.1", + "|3.1|''3.2''|!-3-! !-*-!", + "Paragraph" ].join("\n")); + }); + + unit.add("escaped table", function() { + var dom = fragment( + element("table", { "class": "escaped" }, + element("tbody", + element("tr", element("td", " table "), element("td", " ", element("tt", {'class': 'escape'}, "escaped"), " ")), + element("tr", element("td", " ''not italic'' "), element("td", " '''not bold''' "))))); + generate.call(this, dom, [ + "!| table | !-escaped-! |", + "| ''not italic'' | '''not bold''' |" ].join("\n")); + }); + + unit.add("table, hidden top row", function() { + var dom = fragment( + element("table", + element("tbody", + element("tr", { "class": "hidden" }, element("td", " table "), element("td", " ", element("tt", {'class': 'escape'}, "escaped"), " ")), + element("tr", element("td", " ", element("i", "italic"), " "), element("td", " ", element("b", "bold"), " "))))); + generate.call(this, dom, [ + "-| table | !-escaped-! |", + "| ''italic'' | '''bold''' |" ].join("\n")); + }); + + unit.add("escaped table, hidden top row", function() { + var dom = fragment( + element("table", { "class": "escaped" }, + element("tbody", + element("tr", { "class": "hidden" }, element("td", " table "), element("td", " ", element("tt", {'class': 'escape'}, "escaped"), " ")), + element("tr", element("td", " ''not italic'' "), element("td", " '''not bold''' "))))); + generate.call(this, dom, [ + "-!| table | !-escaped-! |", + "| ''not italic'' | '''not bold''' |" ].join("\n")); + }); + + unit.add("escaped text + table", function() { + var dom = fragment( + element("p", element("tt", { "class": "escape"}, " escaped text", br()), "| table |"), + element("table", + element("tbody", + element("tr", element("td", " table text "))))); + generateFragment.call(this, dom, [ + "!- escaped text", + "-!| table |", + "| table text |" ].join("\n")); + generateFragment.call(this, dom, [ + "!- escaped text", + "-!| table |", + "", + "| table text |" ].join("\n")); + }); + + + unit.add("table 2", function() { + var dom = fragment( + element("p", "Paragraph"), + element("table", + element("tbody", + element("tr", element("td", " 1.1 "), element("td", { colspan: "2" }, " 1.2 ")), + element("tr", element("td", { colspan: "3" }, " 2.1 ")), + element("tr", + element("td", " 3.1 "), + element("td", " ", element("i", "3.2"), " "), + element("td", " ", element("tt", {'class': 'escape'}, "3"), " ", element("tt", {'class': 'escape'}, " - "), " ")))), + element("p", "Paragraph")); + generateFragment.call(this, dom, [ + "Paragraph", + "| 1.1 | 1.2 |", + "| 2.1 |", + "| 3.1 | ''3.2'' | !-3-! !- - -! |", + "Paragraph" ].join("\n")); + generate.call(this, dom, [ + "Paragraph", + "", + "| 1.1 | 1.2 |", + "| 2.1 |", + "| 3.1 | ''3.2'' | !-3-! !- - -! |", + "", + "Paragraph" ].join("\n")); + }); + + unit.add("two tables", function() { + var dom = fragment( + element("p", "Paragraph"), + element("table", + element("tbody", + element("tr", element("td", " 1.1 "), element("td", " 1.2 ")), + element("tr", element("td", " 2.1 "), element("td", " 2.2 ")))), + element("p", ""), + element("table", + element("tbody", + element("tr", element("td", " 3.1 "), element("td", " 3.2 ")), + element("tr", element("td", " 4.1 "), element("td", " 4.2 "))))); + generate.call(this, dom, [ + "Paragraph", + "", + "| 1.1 | 1.2 |", + "| 2.1 | 2.2 |", + "", + "| 3.1 | 3.2 |", + "| 4.1 | 4.2 |" ].join("\n")); + }); + + unit.add("table + rule", function() { + var dom = fragment( + element("table", + element("tbody", element("tr", element("td", " 1st ")))), + element("p", element("b", "bold")), + element("table", + element("tbody", element("tr", element("td", " 2nd ")))), + element("p", element("tt", {'class': 'escape'}, "'''normal"))); + generate.call(this, dom, [ + "| 1st |", + "", + "'''bold'''", + "", + "| 2nd |", + "", + "!-'''normal-!" ].join("\n")); + }); + + unit.add("table [ paragraph, ul ]", function() { + var dom = fragment( + element("table", + element("tbody", + element("tr", + element("td", element("p", "1.1")), + element("td", + element("ul", + element("li", "item 1"), + element("li", "item 2")))), + element("tr", + element("td", + element("p", "2.1* item 3 * item 4") + ))))); + generateWikitext.call(this, dom, [ + "| 1.1 | * item 1\n * item 2 |", + "| 2.1* item 3 * item 4 |" ].join("\n")); + }); + + unit.add("table with incomplete markups", function() { + var dom = fragment( + element("table", + element("tbody", + element("tr", + element("td", " ", element("b", element("i", "' "))), + element("td", " ", element("b", "bold"), " ")) + ) + ) + ); + generateFragment.call(this, dom, "| '''''' | '''bold''' |"); + }); + + unit.add("table with links", function() { + var dom = fragment( + element("table", + element("tbody", + element("tr", + element("td", { 'colspan': '2' }, " ", element("b", "To Learn More..."), " ")), + element("tr", + element("td", " ", a("FitNesse.UserGuide.OneMinuteDescription", "A One-Minute Description"), " "), + element("td", " ", element("i", "What is ", a("FitNesse.FitNesse", "FitNesse"), "? Start here."), " ")), + element("tr", + element("td", " ", a("FitNesse.UserGuide.TwoMinuteExample", "A Two-Minute Example"), " "), + element("td", " ", element("i", "A brief example. Read this one next."), " ")) + ))); + generate.call(this, dom, [ + "| '''To Learn More...''' |", + "| [[A One-Minute Description][FitNesse.UserGuide.OneMinuteDescription]] | ''What is [[FitNesse][FitNesse.FitNesse]]? Start here.'' |", + "| [[A Two-Minute Example][FitNesse.UserGuide.TwoMinuteExample]] | ''A brief example. Read this one next.'' |" ].join("\n")); + }); + + + + unit.add("table from word", function() { + var dom = element("body"); + dom.innerHTML = [ + '', + '', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + ' ', + '
            ', + '

            a

            ', + '

            b

            ', + '             		', + '', + '

            b

            ', + '
            ', + '

            c

            ', + '             		', + '', + '

            d

            ', + '
            ', + '' ].join("\n"); + generateWikitext.call(this, dom, [ + "| a\n\nb | b |", + "| c | d |" ].join("\n")); + }); + + unit.add("domToWikitext for code block", function() { + var br = function() { return element("br") }; + var dom = fragment( + element("h1", "Heading", br(), "1"), + element("h2", "Heading", br(), "2"), + element("h3", "Heading", br(), "3"), + element("h4", "Heading", br(), "4"), + element("h5", "Heading", br(), "5"), + element("h6", "Heading", br(), "6"), + element("p", + "var Wysiwyg = function(textarea) {", " ... ", "}"), + element("p", "> citation continued"), + element("p", "quote continued"), + element("ul", + element("li", "item 1", br(), "continued"), + element("ol", element("li", "item", br(), "1.1"))), + element("p", { 'class': 'meta' }, "!define def {dt dd}"), + element("table", + element("tbody", + element("tr", + element("td", "cell", br(), "1"), + element("th", "cell", br(), "2"))))); + var wikitext = instance.domToWikitext(dom, { formatCodeBlock: true }); + this.assertEqual([ + "!1 Heading 1", + "!2 Heading 2", + "!3 Heading 3", + "!4 Heading 4", + "!5 Heading 5", + "!6 Heading 6", + "var Wysiwyg = function(textarea) { ... }", + "", + "> citation continued", + "", + "quote continued", + "", + " * item 1 continued", + " 1 item 1.1", + "", + "!define def {dt dd}", + "| cell 1 | cell 2 |", + "" ].join("\n"), wikitext); + }); + + unit.add("selectRange", function() { + var d = instance.contentDocument; + function _element() { + var args = [ d ]; + args.push.apply(args, arguments); + return element.apply(this, args); + } + function _text() { + var args = [ d ]; + args.push.apply(args, arguments); + return text.apply(this, args); + } + function assertRangeText(expected, start, startOffset, end, endOffset) { + instance.selectRange(start, startOffset, end, endOffset); + if (expected instanceof RegExp) { + unit.assertMatch(expected, instance.getSelectionText()); + } + else { + unit.assertEqual(expected, instance.getSelectionText()); + } + } + var body = d.body; + while (body.childNodes.length > 0) { + body.removeChild(body.lastChild); + } + body.appendChild(fragment(d, + _element("p", + "The", " quick", " brown", + _element("b", " fox", " jumps", " over"), + " the", " lazy", " dog."), + _element("p", "Brick ", "quiz ", "whangs ", "jumpy ", "veldt ", "fox."))); + + var paragraph1 = body.childNodes[0]; + var paragraph2 = body.childNodes[1]; + var bold = paragraph1.childNodes[3]; + assertRangeText("The", paragraph1.childNodes[0], 0, paragraph1.childNodes[0], 3); + assertRangeText("he", paragraph1.childNodes[0], 1, paragraph1.childNodes[0], 3); + assertRangeText("e quick brow", paragraph1.childNodes[0], 2, paragraph1.childNodes[2], 5); + assertRangeText("ick brown", paragraph1.childNodes[1], 3, paragraph1.childNodes[2], 6); + assertRangeText("ick brown fox j", paragraph1.childNodes[1], 3, bold.childNodes[1], 2); + assertRangeText("ver the laz", bold.childNodes[2], 2, paragraph1.childNodes[5], 4); + assertRangeText(" the lazy", paragraph1.childNodes[4], 0, paragraph1.childNodes[5], 5); + assertRangeText("lazy dog.", paragraph1.childNodes[5], 1, paragraph1.childNodes[6], 5); + assertRangeText(/^fox jumps over the lazy dog\.[\r\n]*Brick quiz whangs$/, + bold.childNodes[0], 1, paragraph2.childNodes[2], 6); + assertRangeText(" fox jumps over", paragraph1, 3, paragraph1, 4); + assertRangeText(" dog.", paragraph1, 6, paragraph1, 7); + assertRangeText("", paragraph1, 7, paragraph1, 7); + assertRangeText("quick brown fox jumps over", paragraph1.childNodes[1], 1, paragraph1, 4); + assertRangeText(" fox jumps over t", paragraph1, 3, paragraph1.childNodes[4], 2); + }); + + unit.add("Collapsible area", function() { + var dom = fragment( + element("div", { "class": "collapsable" }, + element("p", "My content")), + element("p", br())); + generateFragment.call(this, dom, [ + "!*", + "My content", + "*!"].join("\n")); + generateWikitext.call(this, dom, [ + "!*** My content", + "", + "*!"].join("\n")); + }); + + unit.add("Collapsible area with only title", function() { + dom = fragment( + element("div", { "class": "collapsable" }, + element("p", "My content"), + element("p", br())), + element("p", br())); + generateFragment.call(this, dom, [ + "!* My content", + "", + "*!"].join("\n")); + generateWikitext.call(this, dom, [ + "!*** My content", + "", + "*!"].join("\n")); + }); + + unit.add("Collapsible area styles", function() { + var dom = fragment( + element("div", { "class": "collapsable" }, + element("p", "EXPANDED"), + element("p", br()), + element("p", "Expanded content")), + element("p", br()), + element("div", { "class": "collapsable collapsed" }, + element("p", "COLLAPSED"), + element("p", br()), + element("p", "Collapsed content")), + element("p", br()), + element("div", { "class": "collapsable hidden" }, + element("p", "HIDDEN"), + element("p", br()), + element("p", "Hidden content")), + element("p", br())); + generate.call(this, dom, [ + "!*** EXPANDED", + "", + "Expanded content", + "", + "*!", + "!***> COLLAPSED", + "", + "Collapsed content", + "", + "*!", + "!***< HIDDEN", + "", + "Hidden content", + "", + "*!"].join("\n")); + }); + + unit.add("Nested collapsible area", function() { + var dom = fragment( + element("p", "Paragraph"), + element("div", { "class": "collapsable" }, + element("p", "outer"), + element("p", "Text"), + element("div", { "class": "collapsable" }, + element("p", "inner"), + element("p", "More text") + ), + element("p", br())), + element("p", br())); + generateFragment.call(this, dom, [ + "Paragraph", + "!*** outer", + "Text", + "!*** inner", + "More text", + "*!", + "*!"].join("\n")); + generateWikitext.call(this, dom, [ + "Paragraph", + "", + "!*** outer", + "", + "Text", + "", + "!*** inner", + "", + "More text", + "", + "*!", + "*!"].join("\n")); + }); + + unit.add("Collapsible area with table", function() { + var dom = fragment( + element("div", { "class": "collapsable" }, + element("p", "title"), + element("p", "Text"), + element("table", + element('tbody', + element('tr', + element('td', ' table '), + element('td', ' row ')))), + element("p", "More text") + ), + element("p", br())); + generateFragment.call(this, dom, [ + "!*** title", + "Text", + "| table | row |", + "More text", + "*!"].join("\n")); + generateWikitext.call(this, dom, [ + "!*** title", + "", + "Text", + "", + "| table | row |", + "", + "More text", + "", + "*!"].join("\n")); + }); + + unit.add("Collapsible area with header", function() { + var dom = fragment( + element("div", { "class": "collapsable" }, + element("p", "title"), + element("p", br()), + element("h2", "Header"), + element("p", "More text") + ), + element("p", br())); + generateFragment.call(this, dom, [ + "!*** title", + "!2 Header", + "More text", + "*!"].join("\n")); + generateWikitext.call(this, dom, [ + "!*** title", + "", + "!2 Header", + "More text", + "", + "*!"].join("\n")); + }); + + unit.add("Collapsible area with list", function() { + var dom = fragment( + element("div", { "class": "collapsable" }, + element("p", "title"), + element("p", "Text"), + element("ul", + element("li", "item 1"), + element("li", "item 2")), + element("p", "More text") + ), + element("p", br())); + generateFragment.call(this, dom, [ + "!*** title", + "Text", + " * item 1", + " * item 2", + "More text", + "*!"].join("\n")); + generateWikitext.call(this, dom, [ + "!*** title", + "", + "Text", + "", + " * item 1", + " * item 2", + "", + "More text", + "", + "*!"].join("\n")); + }); + + unit.add("table with escaped content", function() { + var dom = fragment( + element("table", + element("tbody", + element("tr", + element("td", "sql") + ), element("tr", + element("td", + element("tt", { "class": "escape" }, " SELECT *", br(), " FROM bar", br()), br() + ) + ) + ) + )); + generateFragment.call(this, dom, [ + "|sql|", + "|!- SELECT *", + " FROM bar", + "-!|", + ""].join("\n")); + generateWikitext.call(this, dom, "| sql |\n| !- SELECT *\n FROM bar\n-! |"); + }); + + unit.add("table with preformatted, escaped content", function() { + var dom = fragment( + element("table", + element("tbody", + element("tr", + element("td", "sql") + ), element("tr", + element("td", + element("pre", + element("tt", { "class": "escape" }, " SELECT *", br(), " FROM bar", br()) + ) + ) + ) + ) + )); + generateFragment.call(this, dom, [ + "|sql|", + "|{{{!- SELECT *", + " FROM bar", + "-!}}}|", + ""].join("\n")); + }); + + unit.run(); + } + + var button = document.createElement("button"); + button.innerHTML = "run »"; + button.style.textDecoration = "underline"; + document.body.appendChild(button); + $(button).click(run); + button.focus(); +}); +// vim:et:ai:sw=4 diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/testunit.js b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/testunit.js similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/testunit.js rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/testunit.js index 218ccc4..398b7fd 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/testunit.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/testunit.js @@ -1,217 +1,217 @@ -Wysiwyg.TestUnit = function() { - this.cases = {}; - this.assertCounts = {}; - this.current = null; -}; - -(function() { - var prototype = Wysiwyg.TestUnit.prototype; - - prototype.inspect = function(value) { - var type = typeof value; - switch (type) { - case "string": - return value.replace(/[\u0000-\u001f\\\u007f\ufffe\uffff]/g, function(m) { - var code = m.charCodeAt(0); - switch (code) { - case 9: return "\\t"; - case 10: return "\\n"; - case 11: return "\\v"; - case 12: return "\\f"; - case 13: return "\\r"; - case 92: return "\\\\"; - } - return "\\u" + (0x10000 + code).toString(16).substring(1); - }); - break; - case "object": - case "function": - if (value instanceof RegExp) { - return value.toString(); - } - } - return "{%}".replace("%", type) + value.toString(); - }; - - prototype.fragment = function() { - var start = 0; - var arg = arguments[0]; - var d; - if (arg.nodeType != 9) { - d = document; - } - else { - d = arg; - start = 1; - } - var fragment = d.createDocumentFragment(); - var length = arguments.length; - for (var i = start; i < length; i++) { - fragment.appendChild(arguments[i]); - } - return fragment; - }; - - prototype.element = function(tag) { - var start = 0; - var arg = arguments[start++]; - var d, tag; - if (typeof arg == "string") { - d = document; - tag = arg; - } - else { - d = arg; - tag = arguments[start++]; - } - var element = d.createElement(tag); - for (var i = start; i < arguments.length; i++) { - arg = arguments[i]; - switch (typeof arg) { - case "object": - if (typeof arg.nodeType == "undefined") { - for (var name in arg) { - var value = arg[name]; - switch (name) { - case "id": - element.id = value; - break; - case "class": case "className": - element.className = value; - break; - default: - element.setAttribute(name, value); - break; - } - } - continue; - } - break; - case "string": - arg = d.createTextNode(arg); - break; - } - element.appendChild(arg); - } - return element; - }; - - prototype.text = function() { - var start = 0; - var arg = arguments[start++]; - var d, text; - if (typeof arg == "string") { - d = document; - text = arg; - } - else { - d = arg; - text = arguments[start++]; - } - return d.createTextNode(text); - }; - - prototype.$ = function(id) { - return typeof id == "string" ? document.getElementById(id) : id; - }; - - prototype.add = function(name, method) { - if (name in this.cases) { - throw "'" + name + "' is in use."; - } - this.cases[name] = method; - this.assertCounts[name] = 0; - }; - - prototype.assertEqual = function(expected, actual, label) { - var count = ++this.assertCounts[this.current]; - if (typeof (expected) == typeof (actual) && expected == actual) { - return true; - } - throw (label || "") + "[" + count + "]\n" - + this.inspect(expected) + " (" + expected.length + ")\n" - + this.inspect(actual) + " (" + actual.length + ")"; - }; - - prototype.assertMatch = function(pattern, string, label) { - var count = ++this.assertCounts[this.current]; - if (pattern.test(string)) { - return true; - } - throw (label || "") + "[" + count + "]\n" - + this.inspect(pattern) + "\n" - + this.inspect(string) + " (" + string.length + ")"; - }; - - prototype.run = function() { - var self = this - var $ = this.$, element = this.element, text = this.text; - var d = document; - var cases = this.cases; - var assertCounts = this.assertCounts; - var names = []; - for (var name in cases) { - names.push(name); - assertCounts[name] = 0; - } - - var container = $("testunit"); - var count; - if (container) { - container.parentNode.removeChild(container); - } - container = element( - "table", { id: "testunit" }, - element("caption", { id: "testunit.summary" }), - element("tbody", { id: "testunit.body" })); - d.body.appendChild(container); - var body = $("testunit.body"); - var summary = $("testunit.summary"); - for (count = 0; count < names.length; count++) { - body.appendChild( - element("tr", - element("td", names[count]), - element("td", { id: "testcase." + count }, "..."))); - } - - count = 0; - var success = 0; - var invoke = function() { - if (count >= names.length) { - self.current = null; - return; - } - - var current = names[count]; - self.current = current; - var cell = $("testcase." + count); - cell.className = "current"; - try { - cases[current].call(self); - cell.className = "success"; - cell.replaceChild(text("OK"), cell.firstChild); - success++; - } - catch (e) { - cell.className = "failure"; - var message = e.message || e.toString(); - if (e.stack) { - message = [ message, e.stack ].join("\n\n"); - } - cell.replaceChild( - element("textarea", { id: "testcase." + count + ".textarea", - rows: message.split("\n").length, - cols: 80, - readonly: "readonly" }), - cell.firstChild); - $("testcase." + count + ".textarea").value = message; - } - summary.innerHTML = success + " / " + names.length; - - count++; - setTimeout(invoke, 10); - }; - - invoke(); - }; -})(); +Wysiwyg.TestUnit = function() { + this.cases = {}; + this.assertCounts = {}; + this.current = null; +}; + +(function() { + var prototype = Wysiwyg.TestUnit.prototype; + + prototype.inspect = function(value) { + var type = typeof value; + switch (type) { + case "string": + return value.replace(/[\u0000-\u001f\\\u007f\ufffe\uffff]/g, function(m) { + var code = m.charCodeAt(0); + switch (code) { + case 9: return "\\t"; + case 10: return "\\n"; + case 11: return "\\v"; + case 12: return "\\f"; + case 13: return "\\r"; + case 92: return "\\\\"; + } + return "\\u" + (0x10000 + code).toString(16).substring(1); + }); + break; + case "object": + case "function": + if (value instanceof RegExp) { + return value.toString(); + } + } + return "{%}".replace("%", type) + value.toString(); + }; + + prototype.fragment = function() { + var start = 0; + var arg = arguments[0]; + var d; + if (arg.nodeType != 9) { + d = document; + } + else { + d = arg; + start = 1; + } + var fragment = d.createDocumentFragment(); + var length = arguments.length; + for (var i = start; i < length; i++) { + fragment.appendChild(arguments[i]); + } + return fragment; + }; + + prototype.element = function(tag) { + var start = 0; + var arg = arguments[start++]; + var d, tag; + if (typeof arg == "string") { + d = document; + tag = arg; + } + else { + d = arg; + tag = arguments[start++]; + } + var element = d.createElement(tag); + for (var i = start; i < arguments.length; i++) { + arg = arguments[i]; + switch (typeof arg) { + case "object": + if (typeof arg.nodeType == "undefined") { + for (var name in arg) { + var value = arg[name]; + switch (name) { + case "id": + element.id = value; + break; + case "class": case "className": + element.className = value; + break; + default: + element.setAttribute(name, value); + break; + } + } + continue; + } + break; + case "string": + arg = d.createTextNode(arg); + break; + } + element.appendChild(arg); + } + return element; + }; + + prototype.text = function() { + var start = 0; + var arg = arguments[start++]; + var d, text; + if (typeof arg == "string") { + d = document; + text = arg; + } + else { + d = arg; + text = arguments[start++]; + } + return d.createTextNode(text); + }; + + prototype.$ = function(id) { + return typeof id == "string" ? document.getElementById(id) : id; + }; + + prototype.add = function(name, method) { + if (name in this.cases) { + throw "'" + name + "' is in use."; + } + this.cases[name] = method; + this.assertCounts[name] = 0; + }; + + prototype.assertEqual = function(expected, actual, label) { + var count = ++this.assertCounts[this.current]; + if (typeof (expected) == typeof (actual) && expected == actual) { + return true; + } + throw (label || "") + "[" + count + "]\n" + + this.inspect(expected) + " (" + expected.length + ")\n" + + this.inspect(actual) + " (" + actual.length + ")"; + }; + + prototype.assertMatch = function(pattern, string, label) { + var count = ++this.assertCounts[this.current]; + if (pattern.test(string)) { + return true; + } + throw (label || "") + "[" + count + "]\n" + + this.inspect(pattern) + "\n" + + this.inspect(string) + " (" + string.length + ")"; + }; + + prototype.run = function() { + var self = this + var $ = this.$, element = this.element, text = this.text; + var d = document; + var cases = this.cases; + var assertCounts = this.assertCounts; + var names = []; + for (var name in cases) { + names.push(name); + assertCounts[name] = 0; + } + + var container = $("testunit"); + var count; + if (container) { + container.parentNode.removeChild(container); + } + container = element( + "table", { id: "testunit" }, + element("caption", { id: "testunit.summary" }), + element("tbody", { id: "testunit.body" })); + d.body.appendChild(container); + var body = $("testunit.body"); + var summary = $("testunit.summary"); + for (count = 0; count < names.length; count++) { + body.appendChild( + element("tr", + element("td", names[count]), + element("td", { id: "testcase." + count }, "..."))); + } + + count = 0; + var success = 0; + var invoke = function() { + if (count >= names.length) { + self.current = null; + return; + } + + var current = names[count]; + self.current = current; + var cell = $("testcase." + count); + cell.className = "current"; + try { + cases[current].call(self); + cell.className = "success"; + cell.replaceChild(text("OK"), cell.firstChild); + success++; + } + catch (e) { + cell.className = "failure"; + var message = e.message || e.toString(); + if (e.stack) { + message = [ message, e.stack ].join("\n\n"); + } + cell.replaceChild( + element("textarea", { id: "testcase." + count + ".textarea", + rows: message.split("\n").length, + cols: 80, + readonly: "readonly" }), + cell.firstChild); + $("testcase." + count + ".textarea").value = message; + } + summary.innerHTML = success + " / " + names.length; + + count++; + setTimeout(invoke, 10); + }; + + invoke(); + }; +})(); diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/wysiwyg-test.html b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/wysiwyg-test.html similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/wysiwyg-test.html rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/wysiwyg-test.html index a19a29f..d08a187 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/wysiwyg-test.html +++ b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/wysiwyg-test.html @@ -1,51 +1,51 @@ - - - - Wysiwyg editor - Spec Runner - - - - - - - - - - - - - - - - - -
            -
            - -
            -
            - - - - - - - - + + + + Wysiwyg editor - Spec Runner + + + + + + + + + + + + + + + + + +
            +
            + +
            +
            + + + + + + + + diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/wysiwyg.css b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/wysiwyg.css similarity index 96% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/wysiwyg.css rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/wysiwyg.css index f2ded11..a87fb8f 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/wysiwyg.css +++ b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/wysiwyg.css @@ -1,207 +1,207 @@ -iframe.wysiwyg { - border: 1px solid #d7d7d7; - display: block; - -moz-user-select: none; - -webkit-user-select: none; -} -div.trac-resizable { - clear: both; -} -textarea#pageContent { - padding: 4px 0; - border: 1px solid #d7d7d7; -} - -iframe.wysiwyg:focus { - border: 1px solid #886; -} -.editor-toggle { - float: right; - font-size: 80%; -} -.editor-toggle label { - float: none; - display: inline; -} -.wysiwyg-toolbar { - float: left; - -moz-user-select: none; - -webkit-user-select: none; - margin-bottom: 4px; -} -.wysiwyg-toolbar ul, .wysiwyg-toolbar li { - list-style-type: none; - margin: 0px; - padding: 0px; - text-indent: 0; - font-size: .9em; -} -.wysiwyg-toolbar ul { - float: left; - margin-right: 8px; -} -.wysiwyg-toolbar ul#wm-style a { - border-radius: 2px; - padding: 0; -} -.wysiwyg-toolbar ul#wm-style .wysiwyg-menu a { - background-image: none; - width: auto; - height: auto; - border: none; - background: white; /* Old browsers */ - background: -moz-linear-gradient(top, white 0%, #eee 100%); /* FF3.6+ */ - background: -webkit-linear-gradient(top, white 0%, #eee 100%); /* Chrome10+,Safari5.1+ */ -} -.wysiwyg-toolbar li { - display: block; - float: left; - background: white; /* Old browsers */ - background: -moz-linear-gradient(top, white 0%, #eee 100%); /* FF3.6+ */ - background: -webkit-linear-gradient(top, white 0%, #eee 100%); /* Chrome10+,Safari5.1+ */ -} -.wysiwyg-toolbar li :link, .wysiwyg-toolbar li :visited { - background: transparent url(menusprite.png) no-repeat; - border: 1px solid gray; - border-right: none; - border-left-color: lightgray; - cursor: default; - width: 32px; - height: 20px; - display: block; - padding: 0 3px; -} -.wysiwyg-toolbar li:first-child, -.wysiwyg-toolbar li:first-child a { - border-top-left-radius: 10px; - border-bottom-left-radius: 10px; -} -.wysiwyg-toolbar li:first-child a { - padding-left: 5px; - border-left-color: gray; -} -.wysiwyg-toolbar li:last-child, -.wysiwyg-toolbar li:last-child a { - border-top-right-radius: 10px; - border-bottom-right-radius: 10px; -} -.wysiwyg-toolbar li:last-child a { - padding-right: 5px; - border-right: 1px solid gray; -} -.wysiwyg-toolbar li a:hover, .wysiwyg-toolbar li.selected a:hover { - background-color: #EEE; -} -.wysiwyg-toolbar li a:active, .wysiwyg-toolbar li.selected a:active { - border: 1px inset gray; - width: 30px; - height: 18px; -} - -.wysiwyg-toolbar li a#wt-style { - width: 78px; - white-space: nowrap; - overflow-x: hidden; - line-height: 1.5; - padding-left: 2px; - padding-right: 2px; - background-position: 51px -594px; -} -.wysiwyg-toolbar li a#wt-style:active, .wysiwyg-toolbar li.selected a#wt-style:active { - border: none; -} - -.wysiwyg-toolbar li a#wt-style span { - display: none; - border-size: 1px; -} - -.wysiwyg-toolbar li.wysiwyg-menu-style a#wt-style span.wysiwyg-menu-style, -.wysiwyg-toolbar li.wysiwyg-menu-paragraph a#wt-style span.wysiwyg-menu-paragraph, -.wysiwyg-toolbar li.wysiwyg-menu-heading1 a#wt-style span.wysiwyg-menu-heading1, -.wysiwyg-toolbar li.wysiwyg-menu-heading2 a#wt-style span.wysiwyg-menu-heading2, -.wysiwyg-toolbar li.wysiwyg-menu-heading3 a#wt-style span.wysiwyg-menu-heading3, -.wysiwyg-toolbar li.wysiwyg-menu-heading4 a#wt-style span.wysiwyg-menu-heading4, -.wysiwyg-toolbar li.wysiwyg-menu-heading5 a#wt-style span.wysiwyg-menu-heading5, -.wysiwyg-toolbar li.wysiwyg-menu-heading6 a#wt-style span.wysiwyg-menu-heading6, -.wysiwyg-toolbar li.wysiwyg-menu-code a#wt-style span.wysiwyg-menu-code { - display: inline; -} - -.wysiwyg-toolbar li a#wt-table { background-position: 3px -2px; } -.wysiwyg-toolbar li a#wt-remove { background-position: 3px -222px; } -.wysiwyg-toolbar li a#wt-strong { background-position: 5px -242px; } -.wysiwyg-toolbar li a#wt-em { background-position: 3px -262px; } -.wysiwyg-toolbar li a#wt-strike { background-position: 3px -282px; } -.wysiwyg-toolbar li a#wt-link { background-position: 5px -302px; } -.wysiwyg-toolbar li a#wt-unlink { background-position: 3px -322px; } -.wysiwyg-toolbar li a#wt-hr { background-position: 3px -342px; } -.wysiwyg-toolbar li a#wt-ul { background-position: 5px -362px; } -.wysiwyg-toolbar li a#wt-indent { background-position: 3px -382px; } -.wysiwyg-toolbar li a#wt-outdent { background-position: 3px -402px; } -.wysiwyg-toolbar li a#wt-escape { background-position: 3px -422px; } -.wysiwyg-toolbar li a#wt-unescape { background-position: 3px -485px; } - -.wysiwyg-toolbar li a#wt-collapsable-closed { background-position: 5px -442px; } -.wysiwyg-toolbar li a#wt-collapsable-open { background-position: 3px -462px; } -.wysiwyg-toolbar li a#wt-collapsable-hidden { background-position: 3px -482px; } -.wysiwyg-toolbar li a#wt-remove-collapsable { background-position: 3px -502px; } - -.wysiwyg-toolbar li a#wt-add-table { background-position: 3px -2px; } -.wysiwyg-toolbar li a#wt-remove-table { background-position: 3px -22px; } -.wysiwyg-toolbar li a#wt-insert-row-after { background-position: 3px -42px; } -.wysiwyg-toolbar li a#wt-insert-row-before { background-position: 3px -62px; } -.wysiwyg-toolbar li a#wt-insert-col-after { background-position: 3px -82px; } -.wysiwyg-toolbar li a#wt-insert-col-before { background-position: 3px -102px; } -.wysiwyg-toolbar li a#wt-insert-cell-after { background-position: 3px -122px; } -.wysiwyg-toolbar li a#wt-insert-cell-before { background-position: 5px -142px; } -.wysiwyg-toolbar li a#wt-delete-row { background-position: 3px -162px; } -.wysiwyg-toolbar li a#wt-delete-col { background-position: 3px -182px; } -.wysiwyg-toolbar li a#wt-delete-cell { background-position: 3px -202px; } - -.wysiwyg-menu { - border: 1px solid #d7d7d7; - padding: 2px 4px; - background-color: #fff; - -moz-opacity: 0.90; - opacity: 0.90; - position: absolute; -} - -.wysiwyg-menu p, -.wysiwyg-menu h1, -.wysiwyg-menu h2, -.wysiwyg-menu h3, -.wysiwyg-menu h4, -.wysiwyg-menu h5, -.wysiwyg-menu h6, -.wysiwyg-menu pre.wiki, -.wysiwyg-menu blockquote.citation { - margin: 4px 0 0; - border: none; -} -.wysiwyg-menu ul, .wysiwyg-menu li { - list-style-type: none; - text-indent: 0em; - margin: 0px; - padding: 0px; -} -.wysiwyg-menu :link, .wysiwyg-menu :visited { - display: block; - padding: 1px; - border: 1px solid #fff; - color: #000; -} -.wysiwyg-menu .selected :link, .wysiwyg-menu .selected :visited { - border: 1px solid #7c4; -} -.wysiwyg-menu a:hover, .wysiwyg-menu .selected a:hover { - border: 1px solid #fb2; -} -.wysiwyg-menu .menu { - font-size: 85%; -} - -.wysiwyg-toolbar .in-table { - display: none; -} +iframe.wysiwyg { + border: 1px solid #d7d7d7; + display: block; + -moz-user-select: none; + -webkit-user-select: none; +} +div.trac-resizable { + clear: both; +} +textarea#pageContent { + padding: 4px 0; + border: 1px solid #d7d7d7; +} + +iframe.wysiwyg:focus { + border: 1px solid #886; +} +.editor-toggle { + float: right; + font-size: 80%; +} +.editor-toggle label { + float: none; + display: inline; +} +.wysiwyg-toolbar { + float: left; + -moz-user-select: none; + -webkit-user-select: none; + margin-bottom: 4px; +} +.wysiwyg-toolbar ul, .wysiwyg-toolbar li { + list-style-type: none; + margin: 0px; + padding: 0px; + text-indent: 0; + font-size: .9em; +} +.wysiwyg-toolbar ul { + float: left; + margin-right: 8px; +} +.wysiwyg-toolbar ul#wm-style a { + border-radius: 2px; + padding: 0; +} +.wysiwyg-toolbar ul#wm-style .wysiwyg-menu a { + background-image: none; + width: auto; + height: auto; + border: none; + background: white; /* Old browsers */ + background: -moz-linear-gradient(top, white 0%, #eee 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, white 0%, #eee 100%); /* Chrome10+,Safari5.1+ */ +} +.wysiwyg-toolbar li { + display: block; + float: left; + background: white; /* Old browsers */ + background: -moz-linear-gradient(top, white 0%, #eee 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, white 0%, #eee 100%); /* Chrome10+,Safari5.1+ */ +} +.wysiwyg-toolbar li :link, .wysiwyg-toolbar li :visited { + background: transparent url(menusprite.png) no-repeat; + border: 1px solid gray; + border-right: none; + border-left-color: lightgray; + cursor: default; + width: 32px; + height: 20px; + display: block; + padding: 0 3px; +} +.wysiwyg-toolbar li:first-child, +.wysiwyg-toolbar li:first-child a { + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; +} +.wysiwyg-toolbar li:first-child a { + padding-left: 5px; + border-left-color: gray; +} +.wysiwyg-toolbar li:last-child, +.wysiwyg-toolbar li:last-child a { + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; +} +.wysiwyg-toolbar li:last-child a { + padding-right: 5px; + border-right: 1px solid gray; +} +.wysiwyg-toolbar li a:hover, .wysiwyg-toolbar li.selected a:hover { + background-color: #EEE; +} +.wysiwyg-toolbar li a:active, .wysiwyg-toolbar li.selected a:active { + border: 1px inset gray; + width: 30px; + height: 18px; +} + +.wysiwyg-toolbar li a#wt-style { + width: 78px; + white-space: nowrap; + overflow-x: hidden; + line-height: 1.5; + padding-left: 2px; + padding-right: 2px; + background-position: 51px -594px; +} +.wysiwyg-toolbar li a#wt-style:active, .wysiwyg-toolbar li.selected a#wt-style:active { + border: none; +} + +.wysiwyg-toolbar li a#wt-style span { + display: none; + border-size: 1px; +} + +.wysiwyg-toolbar li.wysiwyg-menu-style a#wt-style span.wysiwyg-menu-style, +.wysiwyg-toolbar li.wysiwyg-menu-paragraph a#wt-style span.wysiwyg-menu-paragraph, +.wysiwyg-toolbar li.wysiwyg-menu-heading1 a#wt-style span.wysiwyg-menu-heading1, +.wysiwyg-toolbar li.wysiwyg-menu-heading2 a#wt-style span.wysiwyg-menu-heading2, +.wysiwyg-toolbar li.wysiwyg-menu-heading3 a#wt-style span.wysiwyg-menu-heading3, +.wysiwyg-toolbar li.wysiwyg-menu-heading4 a#wt-style span.wysiwyg-menu-heading4, +.wysiwyg-toolbar li.wysiwyg-menu-heading5 a#wt-style span.wysiwyg-menu-heading5, +.wysiwyg-toolbar li.wysiwyg-menu-heading6 a#wt-style span.wysiwyg-menu-heading6, +.wysiwyg-toolbar li.wysiwyg-menu-code a#wt-style span.wysiwyg-menu-code { + display: inline; +} + +.wysiwyg-toolbar li a#wt-table { background-position: 3px -2px; } +.wysiwyg-toolbar li a#wt-remove { background-position: 3px -222px; } +.wysiwyg-toolbar li a#wt-strong { background-position: 5px -242px; } +.wysiwyg-toolbar li a#wt-em { background-position: 3px -262px; } +.wysiwyg-toolbar li a#wt-strike { background-position: 3px -282px; } +.wysiwyg-toolbar li a#wt-link { background-position: 5px -302px; } +.wysiwyg-toolbar li a#wt-unlink { background-position: 3px -322px; } +.wysiwyg-toolbar li a#wt-hr { background-position: 3px -342px; } +.wysiwyg-toolbar li a#wt-ul { background-position: 5px -362px; } +.wysiwyg-toolbar li a#wt-indent { background-position: 3px -382px; } +.wysiwyg-toolbar li a#wt-outdent { background-position: 3px -402px; } +.wysiwyg-toolbar li a#wt-escape { background-position: 3px -422px; } +.wysiwyg-toolbar li a#wt-unescape { background-position: 3px -485px; } + +.wysiwyg-toolbar li a#wt-collapsable-closed { background-position: 5px -442px; } +.wysiwyg-toolbar li a#wt-collapsable-open { background-position: 3px -462px; } +.wysiwyg-toolbar li a#wt-collapsable-hidden { background-position: 3px -482px; } +.wysiwyg-toolbar li a#wt-remove-collapsable { background-position: 3px -502px; } + +.wysiwyg-toolbar li a#wt-add-table { background-position: 3px -2px; } +.wysiwyg-toolbar li a#wt-remove-table { background-position: 3px -22px; } +.wysiwyg-toolbar li a#wt-insert-row-after { background-position: 3px -42px; } +.wysiwyg-toolbar li a#wt-insert-row-before { background-position: 3px -62px; } +.wysiwyg-toolbar li a#wt-insert-col-after { background-position: 3px -82px; } +.wysiwyg-toolbar li a#wt-insert-col-before { background-position: 3px -102px; } +.wysiwyg-toolbar li a#wt-insert-cell-after { background-position: 3px -122px; } +.wysiwyg-toolbar li a#wt-insert-cell-before { background-position: 5px -142px; } +.wysiwyg-toolbar li a#wt-delete-row { background-position: 3px -162px; } +.wysiwyg-toolbar li a#wt-delete-col { background-position: 3px -182px; } +.wysiwyg-toolbar li a#wt-delete-cell { background-position: 3px -202px; } + +.wysiwyg-menu { + border: 1px solid #d7d7d7; + padding: 2px 4px; + background-color: #fff; + -moz-opacity: 0.90; + opacity: 0.90; + position: absolute; +} + +.wysiwyg-menu p, +.wysiwyg-menu h1, +.wysiwyg-menu h2, +.wysiwyg-menu h3, +.wysiwyg-menu h4, +.wysiwyg-menu h5, +.wysiwyg-menu h6, +.wysiwyg-menu pre.wiki, +.wysiwyg-menu blockquote.citation { + margin: 4px 0 0; + border: none; +} +.wysiwyg-menu ul, .wysiwyg-menu li { + list-style-type: none; + text-indent: 0em; + margin: 0px; + padding: 0px; +} +.wysiwyg-menu :link, .wysiwyg-menu :visited { + display: block; + padding: 1px; + border: 1px solid #fff; + color: #000; +} +.wysiwyg-menu .selected :link, .wysiwyg-menu .selected :visited { + border: 1px solid #7c4; +} +.wysiwyg-menu a:hover, .wysiwyg-menu .selected a:hover { + border: 1px solid #fb2; +} +.wysiwyg-menu .menu { + font-size: 85%; +} + +.wysiwyg-toolbar .in-table { + display: none; +} diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/wysiwyg.js b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/wysiwyg.js similarity index 97% rename from src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/wysiwyg.js rename to src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/wysiwyg.js index 2f0a64c..0c2365c 100644 --- a/src/test/resources/fitnesse-target/classes/fitnesse/resources/wysiwyg/wysiwyg.js +++ b/src/test/resources/fitnesse-target/fitnesse/resources/wysiwyg/wysiwyg.js @@ -1,3726 +1,3726 @@ -"use strict"; -/*jslint devel: true, undef: true, browser: true, continue: true, sloppy: true, stupid: true, vars: true, plusplus: true, regexp: true, maxerr: 50, indent: 4 */ -/**** - vim:sw=4:et:ai - - Wysiwyg editor for FitNesse, based on the Trac Wysiwyg editor written by - OpenGroove and Ciklone, BSD licensed. - - ****/ - -var Wysiwyg = function (textarea, options) { - var self = this; - var editorMode = Wysiwyg.getEditorMode(); - var body = document.body; - var i; - - this.textarea = textarea; - this.options = options = options || {}; - - this.createEditable(document, textarea); - var frame = this.frame; - - this.contentWindow = frame.contentWindow; - this.contentDocument = this.contentWindow.document; - - this.initializeEditor(this.contentDocument); - this.wysiwygToolbar = this.createWysiwygToolbar(document); - this.textareaToolbar = this.createTextareaToolbar(document); - this.styleMenu = this.createStyleMenu(document); - this.menus = [ this.styleMenu ]; - this.toolbarButtons = this.setupWysiwygMenuEvents(); - this.setupTextareaMenuEvents(); - - this.toggleEditorButtons = null; - this.savedWysiwygHTML = null; - - this.setupToggleEditorButtons(); - this.setupSyncTextAreaHeight(); - - // Hide both editors, so the current one gets properly shown: - textarea.style.display = frame.style.display = "none"; - - this.textarea.parentNode.insertBefore(this.toggleEditorButtons, this.textarea); - this.textarea.parentNode.insertBefore(this.textareaToolbar, this.textarea); - this.textarea.parentNode.insertBefore(this.wysiwygToolbar, this.textarea); - - document.getElementById("wt-style").parentNode.appendChild(this.menus[0]); - - - this.listenerToggleEditor(editorMode)({ initializing: true }); - - function lazySetup() { - if (self.contentDocument.body) { - var exception; - try { self.execCommand("useCSS", false); } catch (e1) { } - try { self.execCommand("styleWithCSS", false); } catch (e2) { } - if (editorMode === "wysiwyg") { - try { self.loadWysiwygDocument(); } catch (e3) { exception = e3; } - } - self.setupEditorEvents(); - self.setupFormEvent(); - if (exception) { - self.textarea.style.display = self.textareaToolbar.style.display = ""; - self.frame.style.display = self.wysiwygToolbar.style.display = "none"; - alert("Failed to activate the wysiwyg editor."); - throw exception; - } - } else { - setTimeout(lazySetup, 100); - } - } - lazySetup(); -}; - -Wysiwyg.prototype.initializeEditor = function (d) { - var l = window.location; - var i; - var html = [ - '\n', - '', - '', - '' - ]; - - var base = Wysiwyg.paths.base.replace(/\/\/*$/, "/"); - if (base) { - html.push(''); - } else { - html.push(''); - } - - var stylesheets = Wysiwyg.paths.stylesheets; - if (!stylesheets) { - // Work around wysiwyg stops with Agilo - stylesheets = [ "editor.css" ]; - } - var length = stylesheets.length; - for (i = 0; i < length; i++) { - html.push(''); - } - - html.push('', '', '', ''); - - var first = !window.opera && d.addEventListener ? true : false; - if (first) { - d.designMode = "On"; - } - d.open(); - d.write(html.join("")); - d.close(); - if (!first) { - d.designMode = "On"; - if (d !== this.contentWindow.document) { - this.contentDocument = this.contentWindow.document; - } - } - // disable firefox table resizing - try { d.execCommand("enableObjectResizing", false, false); } catch (e) {} - try { d.execCommand("enableInlineTableEditing", false, false); } catch (e) {} -}; - -Wysiwyg.getWrapOn = function () { - var mode = false; - var cookies = (document.cookie || "").split(";"); - var length = cookies.length; - var i; - for (i = 0; i < length; i++) { - var match = /^\s*textwrapon=(\S*)/.exec(cookies[i]); - if (match) { - switch (match[1]) { - case "true": - mode = true; - break; - default: - mode = false; - break; - } - break; - } - } - - return mode; -}; - -Wysiwyg.prototype.listenerToggleEditor = function (type) { - var self = this; - var setEditorMode = function (mode) { - switch (mode) { - case "wysiwyg": - break; - default: - mode = "textarea"; - break; - } - Wysiwyg.editorMode = mode; - Wysiwyg.setCookie("wysiwyg", mode); - }; - - - switch (type) { - case "textarea": - return function (event) { - var textarea = self.textarea; - if (textarea.style.display === "none") { - self.hideAllMenus(); - if (event && !event.initializing) { self.loadWikiText(); } - textarea.style.display = ""; - textarea.setAttribute("tabIndex", ""); - self.syncTextAreaHeight(); - self.frame.style.display = self.wysiwygToolbar.style.display = "none"; - self.frame.setAttribute("tabIndex", "-1"); - self.textareaToolbar.style.display = ""; - setEditorMode(type); - } - self.focusTextarea(); - }; - case "wysiwyg": - return function (event) { - var frame = self.frame; - if (frame.style.display === "none") { - try { - self.loadWysiwygDocument(); - } catch (e) { - Wysiwyg.stopEvent(event || window.event); - alert("Failed to activate the wysiwyg editor."); - throw e; - } - self.textarea.style.display = "none"; - self.textarea.setAttribute("tabIndex", "-1"); - frame.style.display = self.wysiwygToolbar.style.display = ""; - frame.setAttribute("tabIndex", ""); - self.textareaToolbar.style.display = "none"; - setEditorMode(type); - } - self.focusWysiwyg(); - }; - } -}; - -Wysiwyg.prototype.activeEditor = function () { - return this.textarea.style.display === "none" ? "wysiwyg" : "textarea"; -}; - -Wysiwyg.prototype.isModified = function () { - return this.savedWysiwygHTML !== null && this.contentDocument.body.innerHTML !== this.savedWysiwygHTML; -} - -Wysiwyg.prototype.setupFormEvent = function () { - var self = this; - - $(this.textarea.form).submit(function (event) { - var textarea = self.textarea; - try { - if (self.activeEditor() === "wysiwyg") { - var body = self.contentDocument.body; - if (self.isModified()) { - self.textarea.value = self.domToWikitext(body, self.options); - } - } - } catch (e) { - Wysiwyg.stopEvent(event || window.event); - } - }); -}; - -Wysiwyg.prototype.createEditable = function (d, textarea) { - var self = this; - var getStyle = Wysiwyg.getStyle; - var wrapper = d.createElement("div"); - wrapper.innerHTML = ''; - var frame = this.frame = wrapper.firstChild; - - textarea.parentNode.insertBefore(frame, textarea.nextSibling); -}; - -Wysiwyg.prototype.createWysiwygToolbar = function (d) { - var html = [ - '', - '
              ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
            ', - '
              ', - '
              • ', - '
              • ', - '
            ', - '
              ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
            ', - '
              ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
            ', - '
              ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
              • ', - '
            ' ]; - var div = d.createElement("div"); - div.className = "wysiwyg-toolbar"; - div.innerHTML = html.join("").replace(/ href="#">/g, ' href="#" onmousedown="return false" tabindex="-1">'); - return div; -}; - -Wysiwyg.prototype.createStyleMenu = function (d) { - var html = [ - '

            Normal

            ', - '

            Header 1

            ', - '

            Header 2

            ', - '

            Header 3

            ', - '

            Header 4

            ', - '
            Header 5
            ', - '
            Header 6
            ', - '
            Code block
            ' ]; - var menu = d.createElement("div"); - menu.className = "wysiwyg-menu"; - Wysiwyg.setStyle(menu, { display: "none" }); - menu.innerHTML = html.join("").replace(/ href="#">/g, ' href="#" onmousedown="return false" tabindex="-1">'); - return menu; -}; - -Wysiwyg.prototype.setupWysiwygMenuEvents = function () { - function addToolbarEvent(element, self, args) { - var method = args.shift(); - $(element).click(function (event) { - var w = self.contentWindow; - Wysiwyg.stopEvent(event || w.event); - var keepMenus = false, exception; - try { keepMenus = method.apply(self, args); } catch (e) { exception = e; } - if (!keepMenus) { - self.hideAllMenus(); - } - element.blur(); - w.focus(); - if (exception) { - throw exception; - } - }); - } - - function argsByType(self, name, element) { - switch (name) { - case "style": - return [ self.toggleMenu, self.styleMenu, element ]; - case "strong": - return [ self.execDecorate, "bold" ]; - case "em": - return [ self.execDecorate, "italic" ]; - case "underline": - return [ self.execDecorate, "underline" ]; - case "strike": - return [ self.execDecorate, "strikethrough" ]; - case "sub": - return [ self.execDecorate, "subscript" ]; - case "sup": - return [ self.execDecorate, "superscript" ]; - case "escape": - return [ self.execDecorate, "escape" ]; - case "remove": - return [ self.execCommand, "removeformat" ]; - case "paragraph": - return [ self.formatParagraph ]; - case "heading1": - return [ self.formatHeaderBlock, "h1" ]; - case "heading2": - return [ self.formatHeaderBlock, "h2" ]; - case "heading3": - return [ self.formatHeaderBlock, "h3" ]; - case "heading4": - return [ self.formatHeaderBlock, "h4" ]; - case "heading5": - return [ self.formatHeaderBlock, "h5" ]; - case "heading6": - return [ self.formatHeaderBlock, "h6" ]; - case "link": - return [ self.createLink ]; - case "unlink": - return [ self.execCommand, "unlink" ]; - case "ol": - return [ self.insertOrderedList ]; - case "ul": - return [ self.insertUnorderedList ]; - case "outdent": - return [ self.outdent ]; - case "indent": - return [ self.indent ]; - case "table": - return [ self.insertTable ]; - case "insert-cell-before": - return [ self.ui_insertTableCell, false ]; - case "insert-cell-after": - return [ self.ui_insertTableCell, true ]; - case "insert-row-before": - return [ self.insertTableRow, false ]; - case "insert-row-after": - return [ self.insertTableRow, true ]; - case "insert-col-before": - return [ self.insertTableColumn, false ]; - case "insert-col-after": - return [ self.insertTableColumn, true ]; - case "delete-cell": - return [ self.deleteTableCell ]; - case "delete-row": - return [ self.deleteTableRow ]; - case "delete-col": - return [ self.deleteTableColumn ]; - case "remove-table": - return [ self.deleteTable ]; - case "code": - return [ self.formatCodeBlock ]; - case "hr": - return [ self.insertHorizontalRule ]; - case "br": - return [ self.insertLineBreak ]; - case "collapsable-closed": - return [ self.insertCollapsableSection, "collapsed" ]; - case "collapsable-open": - return [ self.insertCollapsableSection ]; - case "collapsable-hidden": - return [ self.insertCollapsableSection, "hidden" ]; - case "remove-collapsable": - return [ self.deleteCollapsableSection ]; - } - return null; - } - - function setup(container) { - var elements = container.getElementsByTagName("a"); - var length = elements.length; - var i; - for (i = 0; i < length; i++) { - var element = elements[i]; - var name = element.id.replace(/^wt-/, ""); - var args = argsByType(this, name, element); - if (args) { - addToolbarEvent(element, this, args); - buttons[name] = element; - } - } - } - - var buttons = {}, i; - setup.call(this, this.wysiwygToolbar); - for (i = 0; i < this.menus.length; i++) { - setup.call(this, this.menus[i]); - } - return buttons; -}; - -Wysiwyg.prototype.createTextareaToolbar = function (d) { - var html = [ - '', - '', - '', - '', - '', - '' ]; - var div = d.createElement("div"); - div.className = "textarea-toolbar"; - div.innerHTML = html.join(" "); - return div; -}; - -Wysiwyg.prototype.setupTextareaMenuEvents = function () { - var textarea = this.textarea; - var container = this.textareaToolbar; - - $('#tt-spreadsheet-to-wiki', container).click(function () { - var translator = new SpreadsheetTranslator(); - translator.parseExcelTable(textarea.value); - textarea.value = translator.getFitNesseTables(); - textarea.focus(); - }); - $('#tt-wiki-to-spreadsheet', container).click(function () { - var selection = textarea.value; - selection = selection.replace(/\r\n/g, '\n'); - selection = selection.replace(/\r/g, '\n'); - // remove the last | at the end of the line - selection = selection.replace(/\|\n/g, '\n'); - // replace all remaining | with \t - selection = selection.replace(/\|/g, '\t'); - textarea.value = selection; - textarea.focus(); - }); - - $('#tt-format-wiki', container).click(function () { - var formatter = new WikiFormatter(); - textarea.value = formatter.format(textarea.value); - textarea.focus(); - }); - - $('#tt-insert-template', container).click(function () { - var selectedValue = $('#tt-template-map').val(); - var inserter = new TemplateInserter(); - inserter.insertInto(selectedValue, textarea); - textarea.focus(); - }); - - function setWrap(wrap) { - if (textarea.wrap) { - textarea.wrap = wrap ? 'soft' : 'off'; - } else { // wrap attribute not supported - try Mozilla workaround - textarea.setAttribute('wrap', wrap ? 'soft' : 'off'); - } - if (wrap) { - $(textarea).removeClass('no_wrap'); - Wysiwyg.setCookie("textwrapon", "true"); - } else { - $(textarea).addClass('no_wrap'); - Wysiwyg.setCookie("textwrapon", "false"); - } - } - - $('#tt-wrap-text', container) - .change(function () { - setWrap($(this).is(':checked')); - }) - .prop('checked', Wysiwyg.getWrapOn()) - .change(); -}; - -Wysiwyg.prototype.toggleMenu = function (menu, element) { - if (menu.style.display === "none") { - this.hideAllMenus(menu); - Wysiwyg.setStyle(menu, { display: "" }); - } else { - this.hideAllMenus(); - } - return true; -}; - -Wysiwyg.prototype.hideAllMenus = function (except) { - var menus = this.menus; - var length = menus.length; - var i; - for (i = 0; i < length; i++) { - if (menus[i] !== except) { - Wysiwyg.setStyle(menus[i], { display: "none" }); - } - } -}; - -Wysiwyg.prototype.execDecorate = function (name) { - if (this.selectionContainsTagName("pre")) { - return; - } - var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; - var position = this.getSelectionPosition(); - var ancestor = {}; - ancestor.start = getSelfOrAncestor(position.start, /^(?:a|tt)$/); - ancestor.end = getSelfOrAncestor(position.end, /^(?:a|tt)$/); - this.expandSelectionToElement(ancestor); - - if (name !== "escape") { - this.execCommand(name); - } else { - this.execDecorateMonospace(); - } - this.selectionChanged(); -}; - -Wysiwyg.prototype.execDecorateMonospace = function () { - var html = this.getSelectionHTML(); - if (/^/i.test(html) && /<\/tt>$/i.test(html)) { - html = html.replace(/|<\/tt>/gi, ""); - } else { - html = '' + html.replace(/<[a-z]+.*?>|<\/[a-z]+>/gi, "") + ""; - } - this.insertHTML(html); - var node = this.contentDocument.getElementById(id); - if (node) { - this.selectNode(node); - } -}; - -Wysiwyg.prototype.execCommand = function (name, arg) { - return this.contentDocument.execCommand(name, false, arg); -}; - -Wysiwyg.prototype.setupEditorEvents = function () { - var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; - var self = this; - var d = this.contentDocument; - var ime = false; - var inPasteAction = false; - - $(d).keydown(function (event) { - var method = null; - var args = null; - event = event || self.contentWindow.event; - var keyCode = event.keyCode; - switch (keyCode) { - case 0x09: // TAB - var range = self.getSelectionRange(); - var stop = false; - var element = getSelfOrAncestor(range.startContainer, /^(?:li|pre|table)$/); - if (element) { - switch (element.tagName.toLowerCase()) { - case "li": - self.execCommand(event.shiftKey ? "outdent" : "indent"); - self.selectionChanged(); - stop = true; - break; - case "pre": - self.insertHTML("\t"); - stop = true; - break; - case "table": - if (getSelfOrAncestor(range.endContainer, "table") === element) { - self.moveFocusInTable(!event.shiftKey); - self.selectionChanged(); - stop = true; - } - break; - } - } - if (stop) { - Wysiwyg.stopEvent(event); - } - return; - case 0xe5: - ime = true; - break; - } - switch ((keyCode & 0x00fffff) | (event.ctrlKey ? 0x40000000 : 0) - | (event.shiftKey ? 0x20000000 : 0) | (event.altKey ? 0x10000000 : 0)) { - case 0x40000042: // C-b - method = self.execDecorate; - args = [ "bold" ]; - break; - case 0x40000049: // C-i - method = self.execDecorate; - args = [ "italic" ]; - break; - case 0x4000004c: // C-l - method = self.toggleAutolink; - args = []; - break; - case 0x40000055: // C-u - method = self.execDecorate; - args = [ "underline" ]; - break; - case 0x40000059: // C-y - method = self.execCommand; - args = [ "redo" ]; - break; - case 0x4000005a: // C-z - method = self.execCommand; - args = [ "undo" ]; - break; - } - if (method !== null) { - Wysiwyg.stopEvent(event); - method.apply(self, args); - self.selectionChanged(); - } else if (keyCode && !inPasteAction) { - var focus = self.getFocusNode(); - if (!getSelfOrAncestor(focus, /^(?:p|li|h[1-6]|t[dh]|d[td]|pre|blockquote)$/)) { - self.execCommand("formatblock", "

            "); - } - } - }); - - $(d).keypress(function (event) { - event = event || self.contentWindow.event; - var modifier = (event.ctrlKey ? 0x40000000 : 0) - | (event.shiftKey ? 0x20000000 : 0) | (event.altKey ? 0x10000000 : 0); - switch (event.charCode || event.keyCode) { - case 0x20: // SPACE - self.detectLink(event); - return; - case 0x3e: // ">" - self.detectLink(event); - return; - case 0x0d: // ENTER - self.detectLink(event); - switch (modifier) { - case 0: - var focus = self._getFocusForTable(); - if (focus.table && focus.cell) { - self.insertTableRow(true); - Wysiwyg.stopEvent(event); - } else if (self.insertParagraphOnEnter) { - self.insertParagraphOnEnter(event); - } - break; - case 0x20000000: // Shift - if (self.insertLineBreakOnShiftEnter) { - self.insertLineBreakOnShiftEnter(event); - } - break; - } - return; - case 0x7c: // "|" - case 28: // ctrl-"|" - var range = self.getSelectionRange(); - var element = getSelfOrAncestor(range.startContainer, "table"); - if (element && - getSelfOrAncestor(range.endContainer, "table") === element && - !getSelfOrAncestor(range.endContainer, /^(?:tt)/)) { - if (event.ctrlKey) { - self.deleteTableCell(); - } else { - self.ui_insertTableCell(true); - } - Wysiwyg.stopEvent(event); - } - return; - } - }); - - $(d).keyup(function (event) { - var keyCode = event.keyCode; - if (ime) { - switch (keyCode) { - case 0x20: // SPACE - self.detectLink(event); - break; - } - ime = false; - } - if (self.getSelectionRange()) { - self.updateElementClassName(self.getSelectionRange().startContainer); - } - self.selectionChanged(); - }); - - $(d).mouseup(function () { - self.selectionChanged(); - }); - - $(d).click(function () { - self.hideAllMenus(); - self.selectionChanged(); - }); - - $(d).on('click', 'div.collapsable', function (event) { - var x = event.pageX - this.offsetLeft; - var y = event.pageY - this.offsetTop; - if (x < 15 && y < 15) { - var e = $(this); - if (e.hasClass('collapsed')) { - e.removeClass('collapsed').addClass('hidden'); - } else if (e.hasClass('hidden')) { - e.removeClass('hidden'); - } else { - e.addClass('collapsed'); - } - event.stopPropagation(); - } - }); - - $(d).on('click', 'a', function () { - return false; - }); - - /* Pasting data is forced in a specific div: pasteddata. In there, the - * raw data is collected and fed to the wikiToDom parser. - */ - $(d).on('paste', 'body', function () { - function tagNode(node) { while (node.nodeType === 3 /* TextNode */) { node = node.parentNode; } return node; } - - // Clone state is change in Firefox, need to extract the fields - var range = self.getSelectionRange(); - - var position = { - startContainer: range.startContainer, - endContainer: range.startContainer === range.endContainer ? range.startContainer.nextSibling : range.endContainer, - sameContainer: range.startContainer === range.endContainer, - atStart: range.startOffset === 0, - atEnd: range.endOffset === range.endContainer.length - }; - inPasteAction = true; - - // Move tables up to the table they're pasted in - function flattenTable(td) { - var nestedRows = $('tr', td); - if (nestedRows.length) { - var parentTr = getSelfOrAncestor(td, 'tr'); - nestedRows.each(function(j, elem) { - $(parentTr).after(elem); - parentTr = $(parentTr).next(); - }); - self.spanTableColumns(getSelfOrAncestor(parentTr, 'table')); - } - - } - // Post processing: - setTimeout(function () { - inPasteAction = false; - - var parentTd = getSelfOrAncestor(position.startContainer, 'td'); - - if (parentTd) { - flattenTable(parentTd); - - // Make a one-liner for the content pasted in the table cell - var wikiText = self.domToWikitext(parentTd, self.options); - var fragment = self.wikitextToOnelinerFragment(wikiText.replace('\n', ' '), self.contentDocument, self.options); - while (parentTd.firstChild) { parentTd.removeChild(parentTd.firstChild); } - parentTd.appendChild(fragment); - - flattenTable(parentTd); - - } else if (position.sameContainer) { - var c = tagNode(position.startContainer); - var wikiText = self.domToWikitext(c, { retainNewLines: true }); - var fragment = self.wikitextToFragment(wikiText, self.contentDocument); - c.parentNode.insertBefore(fragment, c); - c.parentNode.removeChild(c); - // NOTE: At this point the position object is invalid/not useful. - } - }, 20); - }); -}; - -Wysiwyg.prototype.loadWysiwygDocument = function () { - var d = this.contentDocument; - var container = d.body; - if (!container) { return; } - var tmp = container.lastChild; - - while (tmp) { - container.removeChild(tmp); - tmp = container.lastChild; - } - var fragment = this.wikitextToFragment(this.textarea.value, d, this.options); - container.appendChild(fragment); - this.savedWysiwygHTML = container.innerHTML; -}; - -Wysiwyg.prototype.focusWysiwyg = function () { - var self = this; - var w = this.contentWindow; - function lazy() { - w.focus(); - try { self.execCommand("useCSS", false); } catch (e1) { } - try { self.execCommand("styleWithCSS", false); } catch (e2) { } - self.selectionChanged(); - $(window).resize(); - } - setTimeout(lazy, 10); -}; - -Wysiwyg.prototype.loadWikiText = function () { - this.textarea.value = this.domToWikitext(this.contentDocument.body, this.options); - this.savedWysiwygHTML = null; -}; - -Wysiwyg.prototype.focusTextarea = function () { - this.textarea.focus(); - $(window).resize(); -}; - -Wysiwyg.prototype.setupToggleEditorButtons = function () { - var div = document.createElement("div"); - var mode = Wysiwyg.editorMode; - var html = ' ' - + ' ' - + '  '; - var buttons; - var i; - - div.className = "editor-toggle"; - div.innerHTML = html.replace(/@/g, ++Wysiwyg.count); - this.toggleEditorButtons = div; - - buttons = div.getElementsByTagName("input"); - for (i = 0; i < buttons.length; i++) { - var button = buttons[i]; - var token = button.id.replace(/[0-9]+$/, "@"); - switch (token) { - case "editor-wysiwyg-@": - case "editor-textarea-@": - $(button).click(this.listenerToggleEditor(button.value)); - break; - } - } -}; - -Wysiwyg.prototype.setupSyncTextAreaHeight = function () { - var self = this; - var d = document; - var timer = null; - - var editrows = document.getElementById("editrows"); - if (editrows) { - $(editrows).change(changeHeight); - } - - function changeHeight() { - if (timer !== null) { - clearTimeout(timer); - } - setTimeout(sync, 10); - } - - function sync() { - timer = null; - self.syncTextAreaHeight(); - } -}; - -Wysiwyg.prototype.syncTextAreaHeight = function () { - var height = this.textarea.offsetHeight; - var frame = this.frame; - if (height > 0 && frame.height !== height) { - frame.height = height; - } -}; - -Wysiwyg.prototype.detectLink = function (event) { - var range = this.getSelectionRange(); - var node = range.startContainer; - if (!node || !range.collapsed) { - return; - } - var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; - if (getSelfOrAncestor(node, /^(?:a|tt|pre)$/)) { - return; - } - - var offset = range.startOffset; - if (node.nodeType !== 3) { - node = node.childNodes[offset]; - while (node && node.nodeType !== 3) { - node = node.lastChild; - } - if (!node) { - return; - } - offset = node.nodeValue.length; - } else if (offset === 0) { - node = node.previousSibling; - if (!node || node.nodeType === 1) { - return; - } - offset = node.nodeValue.length; - } - var startContainer = node; - var endContainer = node; - var text = [ node.nodeValue.substring(0, offset) ]; - while (true) { - if (/[ \t\r\n\f\v]/.test(text[text.length - 1])) { - break; - } - node = node.previousSibling; - if (!node || node.nodeType === 1) { - break; - } - text.push(node.nodeValue); - startContainer = node; - } - text.reverse(); - text = text.join(""); - if (!text) { - return; - } - - var pattern = this.wikiDetectLinkPattern; - pattern.lastIndex = /[^ \t\r\n\f\v]*$/.exec(text).index; - var match, tmp; - for (tmp = pattern.exec(text); tmp; tmp = pattern.exec(text)) { - match = tmp; - } - if (!match) { - return; - } - - var label = match[0]; - var link = this.normalizeLink(label); - var id = this.generateDomId(); - var anchor = this.createAnchor(link, label, { id: id, "data-wysiwyg-autolink": "true" }); - var anonymous = this.contentDocument.createElement("div"); - anonymous.appendChild(anchor); - var html = anonymous.innerHTML; - - node = endContainer; - var startOffset = match.index; - while (startContainer !== node && startOffset >= startContainer.nodeValue.length) { - startOffset -= startContainer.nodeValue.length; - startContainer = startContainer.nextSibling; - } - var endOffset = startOffset + label.length; - endContainer = startContainer; - while (endContainer !== node && endOffset >= endContainer.nodeValue.length) { - endOffset -= endContainer.nodeValue.length; - endContainer = endContainer.nextSibling; - } - this.selectRange(startContainer, startOffset, endContainer, endOffset); - - offset = text.length - match.index - label.length; - if (offset === 0) { - switch (event.keyCode) { - case 0x20: // SPACE - this.insertHTML(html + "\u00a0"); - Wysiwyg.stopEvent(event); - return; - case 0x0d: // ENTER - if (event.shiftKey) { - if (window.opera || !anonymous.addEventListener) { - this.insertHTML(html + "
            "); - if (window.opera) { - anchor = this.contentDocument.getElementById(id); - node = anchor.parentNode; - offset = node.childNodes.length; - this.selectRange(node, offset, node, offset); - } - Wysiwyg.stopEvent(event); - return; - } - } - this.insertHTML(html); - anchor = this.contentDocument.getElementById(id); - node = event.shiftKey ? anchor.parentNode : anchor; - offset = node.childNodes.length; - this.selectRange(node, offset, node, offset); - return; - } - } - this.insertHTML(html); - anchor = this.contentDocument.getElementById(id); - node = anchor.nextSibling; - if (!node) { - node = anchor.parentNode; - offset = node.childNodes.length; - } - this.selectRange(node, offset, node, offset); -}; - -Wysiwyg.prototype.outdent = function () { - if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { - return; - } - this.execCommand("outdent"); -}; - -Wysiwyg.prototype.indent = function () { - if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { - return; - } - this.execCommand("indent"); -}; - -Wysiwyg.prototype.formatParagraph = function () { - if (this.selectionContainsTagName("table")) { - return; - } - this.execCommand("formatblock", "

            "); - this.selectionChanged(); -}; - -Wysiwyg.prototype.formatHeaderBlock = function (name) { - if (this.selectionContainsTagName("table")) { - return; - } - this.execCommand("formatblock", "<" + name + ">"); - this.selectionChanged(); -}; - -Wysiwyg.prototype.insertOrderedList = function () { - if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { - return; - } - this.execCommand("insertorderedlist"); - this.selectionChanged(); -}; - -Wysiwyg.prototype.insertUnorderedList = function () { - if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { - return; - } - this.execCommand("insertunorderedlist"); - this.selectionChanged(); -}; - -Wysiwyg.prototype.insertTable = function () { - if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { - return; - } - var id = this.generateDomId(); - this.insertHTML(this.tableHTML(id, 2, 2)); - var element = this.contentDocument.getElementById(id); - if (element) { - this.selectNodeContents(element); - } - this.selectionChanged(); -}; - -Wysiwyg.prototype._tableHTML = function (row, col) { - var tr = "" + ((1 << col) - 1).toString(2).replace(/1/g, "") + ""; - var html = [ - '', '', - ((1 << row) - 1).toString(2).replace(/1/g, tr), - '', '
            ' ]; - return html.join(""); -}; - -Wysiwyg.prototype._getFocusForTable = function () { - var hash = { node: null, cell: null, row: null, table: null }; - hash.node = this.getFocusNode(); - hash.cell = hash.node ? Wysiwyg.getSelfOrAncestor(hash.node, /^t[dh]$/) : null; - hash.row = hash.cell ? Wysiwyg.getSelfOrAncestor(hash.cell, "tr") : null; - hash.table = hash.row ? Wysiwyg.getSelfOrAncestor(hash.row, "table") : null; - - return hash; -}; - -Wysiwyg.prototype.ui_insertTableCell = function (after) { - var focus = this._getFocusForTable(); - if (focus.table && focus.cell) { - var row = focus.table.rows[focus.row.rowIndex]; - var cellIndex = focus.cell.cellIndex + (after ? 1 : 0); - $(focus.cell).removeAttr('colspan'); - var cell = this.insertTableCell(row, Math.min(cellIndex, row.cells.length)); - this.spanTableColumns(focus.table); - this.selectNodeContents(cell); - this.selectionChanged(); - cell.focus(); - } -}; - -Wysiwyg.prototype.insertTableRow = function (after) { - var focus = this._getFocusForTable(); - if (focus.table && focus.row) { - var d = this.contentDocument; - var cells = focus.row.getElementsByTagName("td"); - var row = focus.table.insertRow(focus.row.rowIndex + (after ? 1 : 0)); - var cell; - var j; - for (j = 0; j < cells.length; j++) { - cell = this.insertTableCell(row, 0); - } - this.spanTableColumns(focus.table); - this.selectNodeContents(cell); - this.selectionChanged(); - cell.focus(); - return row; - } -}; - -Wysiwyg.prototype.insertTableColumn = function (after) { - var focus = this._getFocusForTable(); - if (focus.table && focus.cell) { - var d = this.contentDocument; - var rows = focus.table.rows; - var length = rows.length; - var cellIndex = focus.cell.cellIndex + (after ? 1 : 0); - var i; - for (i = 1; i < length; i++) { - var row = rows[i]; - this.insertTableCell(row, Math.min(cellIndex, row.cells.length)); - } - this.spanTableColumns(focus.table); - } -}; - -Wysiwyg.prototype.deleteTableCell = function () { - var focus = this._getFocusForTable(); - if (focus.table && focus.cell) { - var row = focus.table.rows[focus.row.rowIndex]; - var cellIndex = focus.cell.cellIndex; - if (cellIndex < row.cells.length) { - row.deleteCell(cellIndex); - } - this.spanTableColumns(focus.table); - //this.selectNode(row.cells[cellIndex < row.cells.length ? cellIndex : row.cells.length - 1].firstChild); - this.moveFocusInTable(false); - } -}; - -Wysiwyg.prototype.deleteTableRow = function () { - var focus = this._getFocusForTable(); - if (focus.table && focus.row) { - focus.table.deleteRow(focus.row.rowIndex); - this.spanTableColumns(focus.table); - } -}; - -Wysiwyg.prototype.deleteTableColumn = function () { - var focus = this._getFocusForTable(); - if (focus.table && focus.cell) { - var rows = focus.table.rows; - var length = rows.length; - var cellIndex = focus.cell.cellIndex; - var i; - for (i = 1; i < length; i++) { - var row = rows[i]; - if (cellIndex < row.cells.length) { - row.deleteCell(cellIndex); - } - } - this.spanTableColumns(focus.table); - } -}; - -Wysiwyg.prototype.deleteTable = function () { - var focus = this._getFocusForTable(); - if (focus.table) { - $(focus.table).remove(); - } -}; - -Wysiwyg.prototype.spanTableColumns = function (table) { - // Spanning columns fitnesse style. - var maxCells = Math.max.apply(Math, $.map($('tr', table), function (e) { - var tds = $('td', e); - tds.removeAttr('colspan'); - return tds.size(); - })); - $('tr', table).each(function () { - var s = $('td', this).size(); - if (s < maxCells) { - $('td:last', this).attr('colspan', maxCells - s + 1); - } - }); -}; - -Wysiwyg.prototype.moveFocusInTable = function (forward) { - var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; - var focus = this.getFocusNode(); - var element = getSelfOrAncestor(focus, /^(?:t[dhr]|table)$/); - var target, table, rows, cells; - switch (element.tagName.toLowerCase()) { - case "td": - case "th": - focus = element; - var row = getSelfOrAncestor(element, "tr"); - cells = row.cells; - if (forward) { - if (focus.cellIndex + 1 < cells.length) { - target = cells[focus.cellIndex + 1]; - } else { - table = getSelfOrAncestor(row, /^(?:tbody|table)$/); - rows = table.rows; - target = row.rowIndex + 1 < rows.length ? rows[row.rowIndex + 1].cells[0] : null; - } - } else { - if (focus.cellIndex > 0) { - target = cells[focus.cellIndex - 1]; - } else { - table = getSelfOrAncestor(row, /^(?:tbody|table)$/); - rows = table.rows; - if (row.rowIndex > 0) { - cells = rows[row.rowIndex - 1].cells; - target = cells[cells.length - 1]; - } else { - target = null; - } - } - } - break; - case "tr": - cells = element.cells; - target = cells[forward ? 0 : cells.length - 1]; - break; - case "tbody": - case "table": - rows = element.rows; - cells = rows[forward ? 0 : rows.length - 1].cells; - target = cells[forward ? 0 : cells.length - 1]; - break; - } - if (target) { - this.selectNodeContents(target); - } else if (table) { - table = getSelfOrAncestor(table, "table"); - var parent = table.parentNode; - var elements = parent.childNodes; - var length = elements.length; - var offset; - for (offset = 0; offset < length; offset++) { - if (table === elements[offset]) { - if (forward) { - offset++; - } - this.selectRange(parent, offset, parent, offset); - } - } - } -}; - -Wysiwyg.prototype.formatCodeBlock = function () { - if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { - return; - } - var text = this.getSelectionText(); - if (!text) { - var node = this.getFocusNode(); - while (node.nodeType === 3) { - node = node.parentNode; - } - text = Wysiwyg.getTextContent(node); - this.selectNode(node); - } - - var fragment = this.getSelectionFragment(); - text = this.domToWikitext(fragment).replace(/\s+$/, ""); - - var d = this.contentDocument; - var anonymous = d.createElement("div"); - var pre = d.createElement("pre"); - pre.className = "wiki"; - anonymous.appendChild(pre); - if (text) { - pre.appendChild(d.createTextNode(text)); - } - - this.insertHTML(anonymous.innerHTML); - this.selectionChanged(); -}; - -Wysiwyg.prototype.insertHorizontalRule = function () { - if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { - return; - } - if (!this.execCommand("inserthorizontalrule")) { - this.insertHTML("

            "); - } - this.selectionChanged(); -}; - -Wysiwyg.prototype.insertCollapsableSection = function (mode) { - var self = this; - var range = this.getSelectionRange(); - var html = this.getSelectionHTML(); - var d = this.contentDocument; - - function topNode(node) { - while (node.parentNode && node.parentNode !== self.contentDocument.body) { - node = node.parentNode; - } - return node; - } - - var nodes; - var start = topNode(range.startContainer); - if (range.startContainer === range.endContainer) { - nodes = range.startOffset === range.endOffset ? [] : [ topNode(range.startContainer) ]; - } else { - var end = topNode(range.endContainer); - nodes = []; - for (var node = start; node !== end; node = node.nextSibling) { - nodes.push(node); - } - nodes.push(end); - } - - var classes = ""; - if (mode) { classes = " " + mode; } - var collapsible = d.createElement("div"); - collapsible.setAttribute("class", "collapsable" + classes); - start.parentNode.insertBefore(collapsible, start); - var sectionName = d.createElement("p"); - sectionName.appendChild(d.createTextNode("section title")); - collapsible.appendChild(sectionName); - for (var node in nodes) { - collapsible.appendChild(nodes[node]); - } - - this.selectNode(sectionName); -}; - -Wysiwyg.prototype.deleteCollapsableSection = function () { - var pos = this.getSelectionPosition(); - var startCol = $(pos.start).parents("div.collapsable")[0]; - var endCol = $(pos.end).parents("div.collapsable")[0]; - if (startCol === endCol) { - $(startCol).before($(startCol).children()); - $(startCol).remove(); - } -}; - -Wysiwyg.prototype.createLink = function () { - if (this.selectionContainsTagName("pre")) { - return; - } - - var focus = this.getFocusNode(); - var anchor = Wysiwyg.getSelfOrAncestor(focus, "a"); - var expand = anchor || Wysiwyg.getSelfOrAncestor(focus, "tt"); - var currLink; - if (anchor) { - var autolink = anchor.getAttribute("data-wysiwyg-autolink"); - - if (autolink === "true") { - var pattern = this.wikiDetectLinkPattern; - pattern.lastIndex = 0; - var label = Wysiwyg.getTextContent(anchor); - var match = pattern.exec(label); - if (match && match.index === 0 && match[0].length === label.length) { - currLink = this.normalizeLink(label); - } - } - if (!currLink) { - currLink = anchor.getAttribute("data-wysiwyg-link") || anchor.href; - } - } else { - currLink = ""; - } - if (expand) { - this.selectNodeContents(expand); - } - var text = this.getSelectionText() || ""; - var newLink = (prompt(text ? "Enter link:" : "Insert link:", currLink) || "").replace(/^\s+|\s+$/g, ""); - if (newLink && newLink !== currLink) { - text = text || newLink; - newLink = this.normalizeLink(newLink); - var id = this.generateDomId(); - var d = this.contentDocument; - var anonymous = d.createElement("div"); - anchor = this.createAnchor(newLink, text, { id: id }); - anonymous.appendChild(anchor); - this.insertHTML(anonymous.innerHTML); - anchor = d.getElementById(id); - if (anchor) { - this.selectNodeContents(anchor); - } - } - this.selectionChanged(); -}; - -Wysiwyg.prototype.createAnchor = function (link, label, attrs) { - var d = this.contentDocument; - var anchor = d.createElement("a"); - var name; - for (name in attrs) { - var value = attrs[name]; - anchor.setAttribute(name, value); - } - anchor.href = link; - anchor.title = link; - anchor.setAttribute("data-wysiwyg-link", link); - if (label) { - anchor.appendChild(d.createTextNode(label)); - } - return anchor; -}; - -Wysiwyg.prototype.createCollapsableSection = function () { - var collapsible = this.contentDocument.createElement("div"); - - $(collapsible).addClass("collapsable"); - return collapsible; -}; - -Wysiwyg.prototype.collectChildNodes = function (dest, source) { - var childNodes = source.childNodes; - var i; - for (i = childNodes.length - 1; i >= 0; i--) { - dest.insertBefore(childNodes[i], dest.firstChild); - } -}; - -Wysiwyg.prototype.generateDomId = function () { - var d = this.contentDocument; - while (true) { - var id = "tmp-" + (new Date().valueOf().toString(36)); - if (!d.getElementById(id)) { - return id; - } - } -}; - -Wysiwyg.prototype.selectionChanged = function () { - var status = { - strong: false, - em: false, - underline: false, - strike: false, - sub: false, - sup: false, - escape: false, - paragraph: false, - heading1: false, - heading2: false, - heading3: false, - heading4: false, - heading5: false, - heading6: false, - link: false, - ol: false, - ul: false, - outdent: false, - indent: false, - table: false, - code: false, - quote: false, - hr: false, - br: false - }; - var tagNameToKey = { - b: "strong", - i: "em", - u: "underline", - del: "strike", - tt: "escape", - p: "paragraph", - h1: "heading1", - h2: "heading2", - h3: "heading3", - h4: "heading4", - h5: "heading5", - h6: "heading6", - a: "link", - pre: "code" - }; - var position = this.getSelectionPosition(); - var node, toolbarButtons, name; - - if (position.start) { - node = position.start === position.end ? position.start.firstChild : position.start.nextSibling; - node = node || position.start; - } else { - node = null; - } - while (node) { - if (node.nodeType === 1) { - name = node.tagName.toLowerCase(); - if (tagNameToKey.hasOwnProperty(name)) { - name = tagNameToKey[name]; - } - status[name] = true; - } - node = node.parentNode; - } - - toolbarButtons = this.toolbarButtons; - for (name in status) { - var button = toolbarButtons[name]; - if (button) { - var parent = button.parentNode; - parent.className = (parent.className || "").replace(/ *\bselected\b|$/, status[name] ? " selected" : ""); - } - } - - if (status["table"]) { - $(".wysiwyg-toolbar .non-table").hide(); - $(".wysiwyg-toolbar .in-table").show(); - } else { - $(".wysiwyg-toolbar .in-table").hide(); - $(".wysiwyg-toolbar .non-table").show(); - } - $(window).resize(); - - var styles = [ "quote", "paragraph", "code", "heading1", - "heading2", "heading3", "heading4", "heading5", "heading6" ]; - var styleButton = toolbarButtons.style; - var styleButtonClass = "wysiwyg-menu-style"; - var i; - for (i = 0; i < styles.length; i++) { - name = styles[i]; - if (status[name]) { - styleButtonClass = "wysiwyg-menu-" + name; - break; - } - } - styleButton.parentNode.className = styleButtonClass; -}; - -(function () { - var _linkScheme = "[a-zA-Z][a-zA-Z0-9+-.]*"; - // cf. WikiSystem.XML_NAME, http://www.w3.org/TR/REC-xml/#id - var _xmlName = "[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD](?:[-:_.A-Za-z0-9\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]*[-_A-Za-z0-9\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD])?"; - var _quotedString = "'[^']+'|" + '"[^"]+"'; - var _wikiPageName = "(?:\\B[\\.<>]|\\b)[A-Z][a-z]+(?:[A-Z][a-z0-9]*)+(?:\\.[A-Z][a-z]+(?:[A-Z][a-z0-9]*)+)*"; - var _wikiTextLink = "\\[\\[(?:.*?)\\]\\[(?:.*?)\\]\\]"; - var wikiInlineRules = []; - wikiInlineRules.push("'''''"); // 1. bolditalic -> badly supported by FitNesse parser - wikiInlineRules.push("'''"); // 2. bold - wikiInlineRules.push("''"); // 3. italic - wikiInlineRules.push("--"); // 4. strike - wikiInlineRules.push("\\{\\{\\{"); // 5. code block (open) - wikiInlineRules.push("\\}\\}\\}"); // 6. code block (close) - wikiInlineRules.push("![-<{(\\[]"); // 7. escaped (open) - wikiInlineRules.push("[->})\\]]!"); // 8. escaped (close) - wikiInlineRules.push(_wikiTextLink); // 9. Wiki link - wikiInlineRules.push(_wikiPageName); // 10. WikiPageName - - var wikiRules = []; - // -1. header - wikiRules.push("^[ \\t\\r\\f\\v]*![1-6][ \\t\\r\\f\\v]+.*?(?:#" + _xmlName + ")?[ \\t\\r\\f\\v]*$"); - // -2. list - wikiRules.push("^[ \\t\\r\\f\\v]*[*1-9-][ \\t\\r\\f\\v]"); - // -3. definition and comment - wikiRules.push("^(?:![a-z]|#)"); - // -4. closing table row - wikiRules.push("\\|[ \\t\\r\\f\\v]*$"); - // -5. cell - wikiRules.push("^-?!?\\||\\|"); - // -6: open collapsible section - wikiRules.push("^!\\*+[<>]?(?:[ \\t\\r\\f\\v]*|[ \\t\\r\\f\\v]+.*)$"); - // -7: close collapsible section - wikiRules.push("^\\*+!$"); - - wikiRules = wikiRules.concat(wikiInlineRules); - - // TODO could be removed? - var wikiDetectLinkRules = [ _wikiPageName ]; - - - var domToWikiInlinePattern = new RegExp("(?:" + wikiInlineRules.join("|") + ")", "g"); - var wikiRulesPattern = new RegExp("(?:(" + wikiRules.join(")|(") + "))", "g"); - var wikiDetectLinkPattern = new RegExp("(?:" + wikiDetectLinkRules.join("|") + ")", "g"); - - Wysiwyg.prototype._linkScheme = _linkScheme; - Wysiwyg.prototype._quotedString = _quotedString; - Wysiwyg.prototype._wikiPageName = _wikiPageName; - Wysiwyg.prototype.wikiInlineRules = wikiInlineRules; - Wysiwyg.prototype.wikiRules = wikiRules; - Wysiwyg.prototype.xmlNamePattern = new RegExp("^" + _xmlName + "$"); - Wysiwyg.prototype.domToWikiInlinePattern = domToWikiInlinePattern; - Wysiwyg.prototype.wikiRulesPattern = wikiRulesPattern; - Wysiwyg.prototype.wikiDetectLinkPattern = wikiDetectLinkPattern; -}()); - -Wysiwyg.prototype.normalizeLink = function (link) { - if (/^[\/.#]/.test(link)) { - link = encodeURIComponent(link); - } -// if (!/^[\w.+\-]+:/.test(link)) { -// link = link; -// } - if (/^[^\"\']/.test(link) && /\s/.test(link)) { - if (link.indexOf('"') === -1) { - link = '"' + link + '"'; - } else if (link.indexOf("'") === -1) { - link = "'" + link + "'"; - } else { - link = '"' + link.replace(/"/g, "%22") + '"'; - } - } - return link; -}; - -Wysiwyg.prototype.isInlineNode = function (node) { - if (node) { - switch (node.nodeType) { - case 1: - return this.wikiInlineTags.hasOwnProperty(node.tagName.toLowerCase()); - case 3: - return true; - } - } - return false; -}; - -(function () { - var blocks = { - p: true, - blockquote: true, - div: true, - li: true, - ul: true, - ol: true, - dl: true, - dt: true, - dd: true, - h1: true, - h2: true, - h3: true, - h4: true, - h5: true, - h6: true, - table: true, - thead: true, - tbody: true, - tr: true, - td: true, - th: true - }; - - function generator(prop, blocks) { - return function (node) { - if (!node) { - return false; - } - while (!node[prop]) { - node = node.parentNode; - if (!node) { - return true; - } - if (node.nodeType === 1 && blocks[node.tagName.toLowerCase()]) { - return true; - } - } - return false; - }; - } - - Wysiwyg.prototype.isLastChildInBlockNode = generator("nextSibling", blocks); - Wysiwyg.prototype.isFirstChildInBlockNode = generator("previousSibling", blocks); -}()); - -Wysiwyg.prototype.wikitextToFragment = function (wikitext, contentDocument) { - var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; - var _linkScheme = this._linkScheme; - var _quotedString = this._quotedString; - var wikiInlineRulesCount = this.wikiInlineRules.length; - var wikiRulesCount = this.wikiRules.length - wikiInlineRulesCount; - - var self = this; - var fragment = contentDocument.createDocumentFragment(); - var holder = fragment; - var lines = wikitext.split("\n"); - var codeText = null; - var currentHeader = null; - var listDepth = []; - var decorationStatus; - var decorationStack; - var indexLines; - var inCollapsibleBlock; - inCollapsibleBlock = false; - - function inParagraph() { return getSelfOrAncestor(holder, "p"); } - function inDefinition() { return $(holder).parents().andSelf().filter("p.meta, p.comment").get(0); } - function inTable() { return getSelfOrAncestor(holder, "table"); } - function inEscapedTable() { return $(holder).parents().andSelf().filter("table.escaped").get(0); } - function inTableRow() { return getSelfOrAncestor(holder, "tr"); } - function inAnchor() { return getSelfOrAncestor(holder, "a"); } - function inEscapedText() { return getSelfOrAncestor(holder, "tt"); } - function inCodeBlock() { return getSelfOrAncestor(holder, "pre"); } - - function handleCodeBlock(value) { - if (!inCodeBlock()) { - var element = contentDocument.createElement("pre"); - holder.appendChild(element); - holder = element; - } else { - holder.appendChild(contentDocument.createTextNode(value)); - } - } - - function closeCodeBlock(value) { - if (inCodeBlock()) { - var target = getSelfOrAncestor(holder, "pre"); - holder = target.parentNode; - } else { - holder.appendChild(contentDocument.createTextNode(value)); - } - } - - function handleHeader(line) { - var match = /^\s*!([1-6])[ \t\r\f\v]+/.exec(line); - if (!match) { - return null; - } - - closeToFragment(); - var tag = "h" + match[1]; - var element = contentDocument.createElement(tag); - holder.appendChild(element); - holder = element; - return tag; - } - - function closeHeader() { - if (currentHeader) { - var target = getSelfOrAncestor(holder, currentHeader); - holder = target.parentNode; - currentHeader = null; - } - } - - function handleDefinition(line) { - closeToFragment(); - openParagraph(); - holder.appendChild(contentDocument.createTextNode(line)); - self.updateElementClassName(holder); - } - - function handleCollapsibleBlock(value) { - inCollapsibleBlock++; - closeParagraph(); - var collapsible = self.createCollapsableSection(); - - holder.appendChild(collapsible); - holder = collapsible; - - var m = /^!\*+([<>])?\s+(.*)$/.exec(value); - if (m) { - if (m[2]) { - handleLine(m[2] || ""); - closeParagraph(); - } - switch (m[1]) { - case "<": // Hidden - $(collapsible).addClass("hidden"); - break; - case ">": // Collapsed - $(collapsible).addClass("collapsed"); - break; - } - } - openParagraph(); - } - - function closeCollapsibleBlock() { - if (inCollapsibleBlock) { - inCollapsibleBlock--; - closeToFragment("div"); - if (holder !== fragment) { - holder = holder.parentNode; - } - // Ensure the user can always edit below the block - openParagraph(); - } - } - - function handleOpenInlineCode(name) { - var d = contentDocument; - var tagName, element; - switch (name) { - case "bold": - tagName = "b"; - break; - case "italic": - tagName = "i"; - break; - case "strike": - tagName = "strike"; - break; - } - - if (holder === fragment) { - openParagraph(); - } - element = d.createElement(tagName); - holder.appendChild(element); - holder = element; - decorationStatus[name] = true; - decorationStack.push(name); - } - - function handleCloseInlineCode(name) { - var d = contentDocument; - var tagNames = []; - var index; - for (index = decorationStack.length - 1; index >= 0; index--) { - var tagName = holder.tagName; - holder = holder.parentNode; - if (decorationStack[index] === name) { - break; - } - tagNames.push(tagName); - } - decorationStack.splice(index, 1); - decorationStatus[name] = false; - while (tagNames.length > 0) { - var element = d.createElement(tagNames.pop()); - holder.appendChild(element); - holder = element; - } - } - - function handleInline(name) { - if (name === "bolditalic") { - if (decorationStatus.italic) { - handleInline("italic"); - handleInline("bold"); - } else { - handleInline("bold"); - handleInline("italic"); - } - return; - } - - if (decorationStatus[name]) { - handleCloseInlineCode(name); - return; - } - handleOpenInlineCode(name); - } - - function handleInlineCode(value, length) { - var d = contentDocument; - var element = d.createElement("tt"); - element.setAttribute("class", "inlinecode"); - value = value.slice(length, -length); - if (value.length > 0) { - element.appendChild(d.createTextNode(value)); - holder.appendChild(element); - } - } - - function createAnchor(link, label, autolink) { - var anchor = self.createAnchor(link, label); - if (autolink) { - anchor.setAttribute("data-wysiwyg-autolink", true); - } - holder.appendChild(anchor); - return anchor; - } - - function handleLinks(value) { - var match = handleLinks.pattern.exec(value); - - if (match) { - var link = match[2]; - - var anchor = createAnchor(link); - holder = anchor; - handleLine(match[1]); - holder = anchor.parentNode; - } else { - holder.appendChild(contentDocument.createTextNode(value)); - } - } - - handleLinks.pattern = new RegExp("\\[" - + "\\[(.*)\\]" - + "\\[(.*)\\]" - + "\\]"); - - function handleWikiLink(value) { - createAnchor(value, value); - } - - function handleWikiPageName(name, label) { - if (!inAnchor()) { - createAnchor(name, label || name, true); - } else { - holder.appendChild(contentDocument.createTextNode(label || name)); - } - } - - function handleList(value) { - var match = /^(\s*)([*1-9-])\s/.exec(value); - var className, depth, start; - if (!match) { - holder.appendChild(contentDocument.createTextNode(value)); - return; - } - - depth = match[1].length; - - var last = listDepth.length - 1; - if (depth > (last >= 0 ? listDepth[last] : -1)) { - closeToFragment("li"); - openList(/[1-9]/.test(match[2]) ? "ol" : "ul", className, start, depth); - } else { - var container, list, tmp; - if (listDepth.length > 1 && depth < listDepth[last]) { - do { - if (depth >= listDepth[last]) { - break; - } - closeList(); - last = listDepth.length - 1; - } while (listDepth.length > 1); - container = holder; - } else { - list = getSelfOrAncestor(holder, "li"); - self.appendBogusLineBreak(list); - container = list.parentNode; - } - tmp = contentDocument.createElement("li"); - container.appendChild(tmp); - holder = tmp; - listDepth[last] = depth; - } - } - - function openList(tag, className, start, depth) { - var d = contentDocument; - var h = holder; - var container = d.createElement(tag); - - if (className) { - container.className = className; - } - if (start) { - container.setAttribute("start", start); - } - var list = d.createElement("li"); - container.appendChild(list); - - var target; - if (h === fragment) { - target = fragment; - } else { - target = getSelfOrAncestor(h, "li"); - target = target ? target.parentNode : h; - } - target.appendChild(container); - holder = list; - listDepth.push(depth); - } - - function closeList() { - var h = holder; - var target = getSelfOrAncestor(h, "li"); - if (target) { - self.appendBogusLineBreak(target); - holder = target.parentNode.parentNode; - } else { - holder = h.parentNode; - } - listDepth.pop(); - } - - function openParagraph() { - if (!inParagraph()) { - var element = contentDocument.createElement("p"); - holder.appendChild(element); - holder = element; - } - } - - function closeParagraph() { - if (inParagraph()) { - var target = holder; - if (target !== fragment) { - target = getSelfOrAncestor(target, "p"); - self.appendBogusLineBreak(target); - self.updateElementClassName(target); - holder = target.parentNode; - } - } - } - - function openEscapedText(value) { - if (!inEscapedText()) { - var element = contentDocument.createElement("tt"); - element.setAttribute('class', { '!-': 'escape', '!<': 'htmlescape', '!{': 'hashtable', '!(': 'nested', '![': 'plaintexttable' }[value]); - holder.appendChild(element); - holder = element; - } else { - holder.appendChild(contentDocument.createTextNode(value)); - } - } - - function closeEscapedText(value) { - if (inEscapedText()) { - var target = holder; - target = getSelfOrAncestor(target, "tt"); - holder = target.parentNode; - } else { - holder.appendChild(contentDocument.createTextNode(value)); - } - } - - function handleTableCell(action, escaped, hidden) { - var d = contentDocument; - var h, table, tbody, cell; - - if (!inTable()) { - h = holder; - - // Just ensure you can type between to tables - if (h.lastChild && h.lastChild.tagName === 'TABLE') { - h.appendChild(d.createElement('p')); - } - table = d.createElement("table"); - if (escaped) { - table.className = "escaped"; - } - tbody = d.createElement("tbody"); - table.appendChild(tbody); - h.appendChild(table); - } else { - h = holder; - tbody = getSelfOrAncestor(h, "tbody"); - } - - if (inTableRow()) { - cell = getSelfOrAncestor(h, "td"); - if (cell) { - self.appendBogusLineBreak(cell); - } - } - - var row; - switch (action) { - case 1: - row = d.createElement("tr"); - tbody.appendChild(row); - if (hidden) { - row.className = "hidden"; - } - break; - case 0: - row = getSelfOrAncestor(h, "tr"); - break; - case -1: - if (inTableRow()) { - var target = getSelfOrAncestor(h, "tr"); - holder = target.parentNode; - } - return; - } - - cell = d.createElement("td"); - row.appendChild(cell); - holder = cell; - decorationStatus = {}; - } - - function closeTable() { - if (inTable()) { - var target = getSelfOrAncestor(holder, "table"); - - self.spanTableColumns(target); - holder = target.parentNode; - } - } - - function closeToFragment(stopTag) { - // Note: we're not exceeding collapsable section boundries - var element = holder; - var _fragment = fragment; - stopTag = stopTag ? stopTag.toLowerCase() : "div"; - - while (element !== _fragment) { - var tag = element.tagName.toLowerCase(); - var method = null; - switch (tag) { - case stopTag: - case "div": - holder = element; - return; - case "p": - method = closeParagraph; - break; - case "li": - case "ul": - case "ol": - method = closeList; - break; - case "td": - case "tr": - case "tbody": - case "table": - method = closeTable; - break; - case "pre": - method = closeCodeBlock; - break; - default: - break; - } - if (method) { - method(); - element = holder; - } else { - element = element.parentNode; - } - } - - holder = _fragment; - } - - function getMatchNumber(match) { - var length = match.length; - var i; - for (i = 1; i < length; i++) { - if (match[i]) { - if (i <= wikiRulesCount) { - return -i; - } - return i - wikiRulesCount; - } - } - return null; - } - - function handleLine(line) { - var wikiRulesPattern = new RegExp(self.wikiRulesPattern.source, "g"); - var prevIndex = wikiRulesPattern.lastIndex; - wikiRulesPattern.lastIndex = 0; - while (true) { - var match = wikiRulesPattern.exec(line); - var matchNumber = null; - var text = null; - - // Deal with unmatched text - if (match) { - matchNumber = getMatchNumber(match); - if (prevIndex < match.index) { - text = line.substring(prevIndex, match.index); - } - } else { - text = line.substring(prevIndex); - } - - if (((prevIndex === 0 && text) || (match && match.index === 0 && matchNumber > 0)) - && !inParagraph() && !inAnchor() && !inEscapedText() && !inCodeBlock() && !currentHeader) { - closeToFragment(); - } - - - if (text || (match && matchNumber > 0)) { - if (inParagraph() && (prevIndex === 0)) { - text = text ? ((holder.hasChildNodes() && holder.lastChild.tagName !== 'BR' ? " " : "") + text) : ""; - } - if ((listDepth.length === 0 && !inTable() && !currentHeader) || holder === fragment) { - openParagraph(); - } - if (text) { - holder.appendChild(contentDocument.createTextNode(text)); - } - } - - if (!match) { - break; - } - prevIndex = wikiRulesPattern.lastIndex; - var matchText = match[0]; - - switch (matchNumber) { - case 1: // bolditalic - if (inEscapedTable() || inEscapedText()) { break; } - handleInline("bolditalic"); - continue; - case 2: // bold - if (inEscapedTable() || inEscapedText()) { break; } - handleInline("bold"); - continue; - case 3: // italic - if (inEscapedTable() || inEscapedText()) { break; } - handleInline("italic"); - continue; - case 4: // strike - if (inEscapedTable() || inEscapedText()) { break; } - handleInline("strike"); - continue; - case 5: // open code block - if (inEscapedTable() || inEscapedText()) { break; } - handleCodeBlock(matchText); - continue; - case 6: // close code block - if (inEscapedTable() || inEscapedText()) { break; } - closeCodeBlock(matchText); - continue; - case 7: // open escaped - if (inEscapedText()) { break; } - openEscapedText(matchText); - continue; - case 8: // close escaped - closeEscapedText(matchText); - continue; - case 9: // Wiki link - if (inEscapedTable() || inEscapedText() || inCodeBlock()) { break; } - handleLinks(matchText); - continue; - case 10: // WikiPageName - if (inEscapedTable() || inEscapedText() || inCodeBlock()) { break; } - handleWikiPageName(matchText); - continue; - case -1: // header - currentHeader = handleHeader(matchText); - if (currentHeader) { - var m = /^\s*!([1-6])[ \t\r\f\v]+/.exec(line); - wikiRulesPattern.lastIndex = prevIndex = m[0].length; - continue; - } - break; - case -2: // list - if (inEscapedText() || inCodeBlock()) { break; } - handleList(matchText); - continue; - case -3: // definition (leading "!") and comments (leading "#") - if (inEscapedText() || inCodeBlock()) { break; } - handleDefinition(matchText); - continue; - case -4: // closing table row - if (inEscapedText() || inCodeBlock()) { break; } - if (inTable()) { - handleTableCell(-1); - continue; - } - break; - case -5: // cell - if (inDefinition()) { break; } - if (inEscapedText() || inCodeBlock()) { - if (/^-!/.test(matchText)) { - closeEscapedText(matchText); - matchText = matchText.substring(2); - if (inTable()) { - handleTableCell(-1); - continue; - } - } - break; - } - if (!inTable() && match.index === 0) { - closeToFragment(); - } - wikiRulesPattern.lastIndex = prevIndex; - handleTableCell(inTableRow() ? 0 : 1, /^-?!/.test(matchText), /^-/.test(matchText)); - continue; - case -6: // collapsible section - if (inEscapedText()) { break; } - handleCollapsibleBlock(matchText); - continue; - case -7: // close collapsible section - if (inEscapedText()) { break; } - closeCollapsibleBlock(); - continue; - } - - if (matchText) { - if (listDepth.length === 0 && !currentHeader && !inTable() && !inAnchor()) { - openParagraph(); - } - holder.appendChild(contentDocument.createTextNode(matchText)); - } - } - - if (inEscapedText() || inCodeBlock()) { - var element = contentDocument.createElement("br"); - holder.appendChild(element); - } else if (inParagraph()) { - self.updateElementClassName(holder); - if (inDefinition()) { - closeParagraph(); - } - } - } - - for (indexLines = 0; indexLines < lines.length; indexLines++) { - var line = lines[indexLines].replace(/\r$/, ""); - if (/^----/.test(line)) { - closeToFragment(); - fragment.appendChild(contentDocument.createElement("hr")); - continue; - } - if (line.length === 0 && !inCodeBlock()) { - closeToFragment(); - continue; - } - line = line.replace(/\t/g, " "); - line = line.replace(/\u00a0/g, " "); - - decorationStatus = {}; - decorationStack = []; - - handleLine(line); - - // Close headers here, since they should not interfere with other line types parsed. - if (currentHeader) { - closeHeader(); - } - if (inTable() && !inEscapedText()) { - handleTableCell(-1); - } - - } - closeToFragment(); - - return fragment; -}; - -Wysiwyg.prototype.wikitextToOnelinerFragment = function (wikitext, contentDocument) { - var source = this.wikitextToFragment(wikitext, contentDocument); - var fragment = contentDocument.createDocumentFragment(); - this.collectChildNodes(fragment, source.firstChild); - return fragment; -}; - -Wysiwyg.prototype.wikiOpenTokens = { - "h1": "!1 ", - "h2": "!2 ", - "h3": "!3 ", - "h4": "!4 ", - "h5": "!5 ", - "h6": "!6 ", - "b": "'''", - "strong": "'''", - "i": "''", - "em": "''", - "del": "--", - "strike": "--", - "hr": "----\n", - "table": true, - "tbody": true -}; - -Wysiwyg.prototype.wikiCloseTokens = { - "#text": true, - "a": true, - "tt": true, - "b": "'''", - "strong": "'''", - "i": "''", - "em": "''", - "del": "--", - "strike": "--", - "hr": true, - "tbody": true, - "tr": "|\n", - "td": true, - "th": true -}; - -Wysiwyg.prototype.wikiBlockTags = { - "h1": true, - "h2": true, - "h3": true, - "h4": true, - "h5": true, - "h6": true, - "table": true, - "hr": true -}; - -Wysiwyg.prototype.wikiInlineTags = { - "a": true, - "tt": true, - "b": true, - "strong": true, - "i": true, - "em": true, - "u": true, - "del": true, - "strike": true, - "sub": true, - "sup": true, - "br": true, - "span": true -}; - -Wysiwyg.prototype.domToWikitext = function (root, options) { - options = options || {}; - var retainNewLines = !!options.retainNewLines; - - var self = this; - var getTextContent = Wysiwyg.getTextContent; - var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; - var wikiOpenTokens = this.wikiOpenTokens; - var wikiCloseTokens = this.wikiCloseTokens; - var wikiInlineTags = this.wikiInlineTags; - var wikiBlockTags = this.wikiBlockTags; - var xmlNamePattern = this.xmlNamePattern; - var domToWikiInlinePattern = this.domToWikiInlinePattern; - var wikiPageNamePattern = new RegExp("^" + this._wikiPageName + "$"); - var decorationTokenPattern = /^(?:'''|'')$/; - - var texts = []; - var stack = []; - var last = root; - var listDepth = 0; - var quoteCitation = false; - var inCodeBlock = false; - var skipNode = null; - - function tokenFromSpan(node) { - var style = node.style; - if (style.fontWeight === "bold") { - return wikiOpenTokens.b; - } - if (style.fontStyle === "italic") { - return wikiOpenTokens.i; - } - switch (style.textDecoration) { - case "line-through": - return wikiOpenTokens.del; - } - return undefined; - } - - function nodeDecorations(node) { - var _wikiOpenTokens = wikiOpenTokens; - var _decorationTokenPattern = decorationTokenPattern; - var hash = {}; - - while (true) { - var childNodes = node.childNodes; - if (!childNodes || childNodes.length !== 1) { - break; - } - var child = childNodes[0]; - if (child.nodeType !== 1) { - break; - } - var token = _wikiOpenTokens[child.tagName.toLowerCase()]; - if (_decorationTokenPattern.test(token)) { - hash[token] = true; - } - node = child; - } - - return hash; - } - - function pushTextWithDecorations(text, node) { - var _texts = texts; - var _decorationTokenPattern = decorationTokenPattern; - var decorationsHash = nodeDecorations(node); - var decorations = []; - var cancelDecorations = []; - var token; - - while (_texts.length > 0) { - token = _texts[_texts.length - 1]; - if (_decorationTokenPattern.test(token)) { - if (decorationsHash[token]) { - delete decorationsHash[token]; - cancelDecorations.push(_texts.pop()); - continue; - } - if ((token === "'''" || token === "''") && _texts.length > 1) { - var moreToken = _texts[_texts.length - 2]; - if (_decorationTokenPattern.test(moreToken) - && token + moreToken === "'''''" - && decorationsHash[moreToken]) { - delete decorationsHash[moreToken]; - cancelDecorations.push(moreToken); - _texts[_texts.length - 2] = _texts[_texts.length - 1]; - _texts.pop(); - } - } - } - break; - } - - for (token in decorationsHash) { - decorations.push(token); - } - decorations.sort(); - - if (decorations.length > 0) { - _texts.push.apply(_texts, decorations); - } - _texts.push(text); - - if (decorations.length > 0) { - decorations.reverse(); - _texts.push.apply(_texts, decorations); - } - if (cancelDecorations.length > 0) { - cancelDecorations.reverse(); - _texts.push.apply(_texts, cancelDecorations); - } - } - - function pushToken(token) { - var _texts = texts; - var _decorationTokenPattern = decorationTokenPattern; - var length = _texts.length; - if (length === 0 || !_decorationTokenPattern.test(token)) { - _texts.push(token); - return; - } - var last = _texts[length - 1]; - if (!_decorationTokenPattern.test(last)) { - _texts.push(token); - return; - } - if (last === token) { - _texts.pop(); - return; - } - if (length < 2 || last + token !== "'''''") { - _texts.push(token); - return; - } - if (_texts[length - 2] === token) { - _texts[length - 2] = _texts[length - 1]; - _texts.pop(); - } else { - _texts.push(token); - } - } - - function linkText(link, label) { - if (link === label) { - return link; - } - if (!/\]/.test(label) && !/^[\"\']/.test(label)) { - return "[[" + label + "][" + link + "]]"; - } - return "[[" + label.replace(/"+/g, "") + "][" + link + "]]"; - } - - function pushAnchor(node, bracket) { - var _texts = texts; - var link = node.getAttribute("data-wysiwyg-link"); - var autolink = node.getAttribute("data-wysiwyg-autolink"); - - link = (link || node.href).replace(/^\s+|\s+$/g, ""); - var label = self.domToWikitext(node, options); - if (!label) { - return; - } - var text = null; - if (autolink === "true") { - if (wikiPageNamePattern.test(label)) { - text = label; - link = label; - } - } - if (text === null) { - text = linkText(link, label); - } - _texts.push(text); - } - - function string(source, times) { - var value = (1 << times) - 1; - return (value <= 0) ? "" : value.toString(2).replace(/1/g, source); - } - - function open(name, node) { - if (skipNode !== null) { - return; - } - var _texts = texts; - var token = wikiOpenTokens[name]; - if (token !== undefined) { - if (wikiBlockTags[name] && self.isInlineNode(node.previousSibling)) { - _texts.push("\n"); - } - if (token !== true) { - pushToken(token); - } - if (name === "table") { - if ($('tr', node).first().hasClass('hidden')) { - _texts.push("-"); - } - if ($(node).hasClass("escaped")) { - _texts.push("!"); - } - } - } else { - var value, text; - switch (name) { - case "#text": - value = node.nodeValue; - if (value) { - if (!(inCodeBlock || retainNewLines)) { - if (value && !self.isInlineNode(node.previousSibling || node.parentNode)) { - value = value.replace(/^[ \t\r\n\f\v]+/g, ""); - } - if (value && !self.isInlineNode(node.nextSibling || node.parentNode)) { - value = value.replace(/[ \t\r\n\f\v]+$/g, ""); - } - value = value.replace(/\r?\n/g, " "); - } - if (value) { - var length = _texts.length; - var prev = length > 0 ? _texts[length - 1] : null; - _texts.push(value); - } - } - break; - case "p": - if (!/[^ \t\r\n\f\v]/.test(getTextContent(node))) { - skipNode = node; - } - break; - case "a": - skipNode = node; - pushAnchor(node); - break; - case "li": - _texts.push(" " + string(" ", listDepth - 1)); - var container = node.parentNode; - if ((container.tagName || "").toLowerCase() === "ol") { - _texts.push("1 "); - } else { - _texts.push("* "); - } - break; - case "ul": - case "ol": - if (listDepth === 0) { - if (self.isInlineNode(node.previousSibling)) { - _texts.push("\n"); - } - } else if (listDepth > 0) { - if (node.parentNode.tagName.toLowerCase() === "li") { - _texts.push("\n"); - } - } - listDepth++; - break; - case "br": - if (inCodeBlock || retainNewLines) { - _texts.push("\n"); - } else if (!self.isBogusLineBreak(node)) { - _texts.push(" "); - } - break; - case "pre": - _texts.push("{{{"); - inCodeBlock = true; - break; - case "th": - case "td": - skipNode = node; - _texts.push("|"); - text = self.domToWikitext(node, self.options).replace(/^ +| +$/g, "").replace(/\n$/, ""); - if (text) { - _texts.push(" ", text, " "); - break; - } else { - _texts.push(" "); - } - break; - case "tr": - break; - case "tt": - skipNode = node; - value = node.innerHTML.replace(/
            /g, '\n').replace(/>/g, ">").replace(/</g, "<"); - if (value) { - var tags = { - 'escape': [ "!-", "-!" ], - 'htmlescape': [ "!<", ">!" ], - 'hashtable': [ "!{", "}!" ], - 'nested': [ "!(", ")!" ], - 'plaintexttable': [ "![", "]!" ], - 'inlinecode': [ "{{{", "}}}" ] - }[node.getAttribute('class') || "escape"]; - text = tags[0] + value + tags[1]; - pushTextWithDecorations(text, node); - } - break; - case "span": - if (node.className === "wikianchor" && xmlNamePattern.test(node.id || "")) { - skipNode = node; - text = self.domToWikitext(node, self.options).replace(/^ +| +$|\]/g, ""); - _texts.push("[=#", node.id, text ? " " + text + "]" : "]"); - } else { - token = tokenFromSpan(node); - if (token !== undefined) { - pushToken(token); - } - } - break; - case "div": - if ($(node).hasClass("collapsable")) { - _texts.push("!***"); - if ($(node).hasClass("collapsed")) { - _texts.push("> "); - } else if ($(node).hasClass("hidden")) { - _texts.push("< "); - } else { - _texts.push(" "); - } - } - break; - case "script": - case "style": - skipNode = node; - break; - } - } - } - - function close(name, node) { - if (skipNode !== null) { - if (skipNode === node) { - skipNode = null; - } - return; - } - var _texts = texts; - var token = wikiCloseTokens[name]; - if (token === true) { - // nothing to do - } else if (token !== undefined) { - pushToken(token); - } else { - switch (name) { - case "p": - if ($(node).hasClass('meta') || retainNewLines) { - _texts.push("\n"); - } else { - _texts.push("\n\n"); - } - break; - case "li": - if (node.getElementsByTagName("li").length === 0) { - _texts.push("\n"); - } - break; - case "ul": - case "ol": - listDepth--; - if (listDepth === 0) { - _texts.push("\n"); - } - break; - case "pre": - var text; - var parentNode = node.parentNode; - if (parentNode && /^(?:li|dd)$/i.test(parentNode.tagName)) { - var nextSibling = node.nextSibling; - if (!nextSibling) { - text = "\n}}}"; - } else if (nextSibling.nodeType !== 1) { - text = "\n}}}"; - } else if (nextSibling.tagName.toLowerCase() === "pre") { - text = "}}}"; - } else { - text = "\n}}}"; - } - if (text.slice(-1) === "\n") { - text += listDepth > 0 ? " " + string(" ", listDepth) : " "; - } - } else { - text = "}}}"; - } - _texts.push(text); - inCodeBlock = false; - break; - case "span": - token = tokenFromSpan(node); - if (token !== undefined) { - _texts.push(token); - } - break; - case "div": - if ($(node).hasClass("collapsable")) { - _texts.push("*!\n"); - } - break; - case "table": - _texts.push("\n"); - break; - } - } - if (/^h[1-6]$/.test(name)) { - if (xmlNamePattern.test(node.id || "")) { - _texts.push(" #", node.id); - } - _texts.push("\n"); - } - } - - function iterator(node) { - var name = null; - switch (node && node.nodeType) { - case 1: // element - name = node.tagName.toLowerCase(); - break; - case 3: // text - name = "#text"; - break; - } - - if (node && last === node.parentNode) { - // down - // nothing to do - } else if (node && last === node.previousSibling) { - // forward - close(stack.pop(), last); - } else { - // up, forward - var tmp = last; - var nodeParent = node ? node.parentNode : root; - while (true) { - var parent = tmp.parentNode; - if (parent === node) { - break; - } - close(stack.pop(), tmp); - if (parent === nodeParent || !parent) { - if (!node) { - return; - } - break; - } - tmp = parent; - } - } - open(name, node); - stack.push(name); - last = node; - } - - this.treeWalk(root, iterator); - return texts.join("").replace(/^(?: *\n)+/, "").replace(/(?: *\n)+$/, "\n"); -}; - -Wysiwyg.prototype.updateElementClassName = function (element) { - var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; - var p = getSelfOrAncestor(element, "p"); - if (p) { - if (/^![a-z]/.test(p.innerHTML)) { - if (p.className !== 'meta') { - p.className = 'meta'; - } - } else if (/^#/.test(p.innerHTML)) { - if (p.className !== 'comment') { - p.className = 'comment'; - } - } else { - $(p).removeClass(); - } - } -}; - -if (window.getSelection) { - Wysiwyg.prototype.appendBogusLineBreak = function (element) { - var wikiInlineTags = this.wikiInlineTags; - var last = element.lastChild; - var br = this.contentDocument.createElement("br"); - while (true) { - if (!last) { - break; - } - if (last.nodeType !== 1) { - return; - } - var name = last.tagName.toLowerCase(); - if (name === "br") { - break; - } - if (!wikiInlineTags[name]) { - return; - } - last = last.lastChild || last.previousSibling; - } - element.appendChild(br); - }; - Wysiwyg.prototype.isBogusLineBreak = Wysiwyg.prototype.isLastChildInBlockNode; - Wysiwyg.prototype.insertParagraphOnEnter = function (event) { - var range = this.getSelectionRange(); - var node = range.endContainer; - var header = null; - if (node && node.nodeType === 3 && range.endOffset === node.nodeValue.length) { - var nextSibling = node.nextSibling; - if (!nextSibling || nextSibling.tagName.toLowerCase() === "br") { - while (node) { - if (node.nodeType === 1 && /^h[1-6]$/i.exec(node.tagName)) { - header = node; - break; - } - node = node.parentNode; - } - if (header) { - var parent = header.parentNode; - var childNodes = parent.childNodes; - var length = childNodes.length; - var offset; - for (offset = 0; offset < length; offset++) { - if (childNodes[offset] === header) { - offset++; - break; - } - } - this.selectRange(parent, offset, parent, offset); - this.insertHTML('


            '); - Wysiwyg.stopEvent(event); - } - } - } - }; - Wysiwyg.prototype.tableHTML = function (id, row, col) { - var html = this._tableHTML(row, col); - return html.replace(/<\/td>/g, '
            ').replace(//, ''); - }; - Wysiwyg.prototype.insertTableCell = function (row, index) { - var cell = row.insertCell(index); - this.appendBogusLineBreak(cell); - return cell; - }; - Wysiwyg.prototype.getFocusNode = function () { - return this.contentWindow.getSelection().focusNode; - }; - if (window.opera) { - Wysiwyg.prototype.insertLineBreak = function () { - this.execCommand("inserthtml", "
            "); - }; - Wysiwyg.prototype.insertLineBreakOnShiftEnter = null; - } else if (window.getSelection().setBaseAndExtent) { // Safari 2+ - Wysiwyg.prototype.insertLineBreak = function () { - this.execCommand("insertlinebreak"); - }; - Wysiwyg.prototype.insertLineBreakOnShiftEnter = function (event) { - this.insertLineBreak(); - Wysiwyg.stopEvent(event); - }; - } else { // Firefox 2+ - Wysiwyg.prototype.insertLineBreak = function () { - var d = this.contentDocument; - var event = d.createEvent("KeyboardEvent"); - event.initKeyEvent("keypress", true, true, null, false, false, true, false, 0x000d, 0); - d.body.dispatchEvent(event); - }; - Wysiwyg.prototype.insertLineBreakOnShiftEnter = null; - } - if (window.getSelection().removeAllRanges) { - Wysiwyg.prototype.selectNode = function (node) { - var selection = this.contentWindow.getSelection(); - selection.removeAllRanges(); - var range = this.contentDocument.createRange(); - range.selectNode(node); - selection.addRange(range); - }; - Wysiwyg.prototype.selectNodeContents = function (node) { - var selection = this.contentWindow.getSelection(); - selection.removeAllRanges(); - var range = this.contentDocument.createRange(); - range.selectNodeContents(node); - selection.addRange(range); - }; - Wysiwyg.prototype.selectRange = function (start, startOffset, end, endOffset) { - var selection = this.contentWindow.getSelection(); - selection.removeAllRanges(); - var range = this.contentDocument.createRange(); - range.setStart(start, startOffset); - range.setEnd(end, endOffset); - selection.addRange(range); - }; - Wysiwyg.prototype.getNativeSelectionRange = function () { - var selection = this.contentWindow.getSelection(); - return selection.rangeCount > 0 ? selection.getRangeAt(0) : null; - }; - Wysiwyg.prototype.expandSelectionToElement = function (arg) { - if (arg.start || arg.end) { - var selection = this.contentWindow.getSelection(); - var range = this.getNativeSelectionRange() || this.contentDocument.createRange(); - selection.removeAllRanges(); - if (arg.start) { - range.setStartBefore(arg.start); - } - if (arg.end) { - range.setEndAfter(arg.end); - } - selection.addRange(range); - } - }; - Wysiwyg.prototype.insertHTML = function (html) { - this.execCommand("inserthtml", html); - }; - } else { // Safari 2 - Wysiwyg.prototype.selectNode = function (node) { - var selection = this.contentWindow.getSelection(); - var range = this.contentDocument.createRange(); - range.selectNode(node); - selection.setBaseAndExtent(range.startContainer, range.startOffset, range.endContainer, range.endOffset); - range.detach(); - }; - Wysiwyg.prototype.selectNodeContents = function (node) { - this.selectRange(node, 0, node, node.childNodes.length); - }; - Wysiwyg.prototype.selectRange = function (start, startOffset, end, endOffset) { - var selection = this.contentWindow.getSelection(); - selection.setBaseAndExtent(start, startOffset, end, endOffset); - }; - Wysiwyg.prototype.getNativeSelectionRange = function () { - var selection = this.contentWindow.getSelection(); - if (selection.anchorNode) { - var range = this.contentDocument.createRange(); - range.setStart(selection.baseNode, selection.baseOffset); - range.setEnd(selection.extentNode, selection.extentOffset); - if (range.collapsed && !selection.isCollapsed) { - range.setStart(selection.extentNode, selection.extentOffset); - range.setEnd(selection.baseNode, selection.baseOffset); - } - return range; - } - return null; - }; - Wysiwyg.prototype.expandSelectionToElement = function (arg) { - if (arg.start || arg.end) { - var selection = this.contentWindow.getSelection(); - var range = this.getNativeSelectionRange(); - if (arg.start) { - range.setStartBefore(arg.start); - } - if (arg.end) { - range.setEndAfter(arg.end); - } - selection.setBaseAndExtent(range.startContainer, range.startOffset, range.endContainer, range.endOffset); - range.detach(); - } - }; - Wysiwyg.prototype.insertHTML = function (html) { - var range = this.getNativeSelectionRange(); - if (range) { - var d = this.contentDocument; - var tmp = d.createRange(); - tmp.setStart(d.body, 0); - tmp.setEnd(d.body, 0); - var fragment = tmp.createContextualFragment(html); - range.deleteContents(); - range.insertNode(fragment); - range.detach(); - tmp.detach(); - } - }; - } - Wysiwyg.prototype.getSelectionRange = Wysiwyg.prototype.getNativeSelectionRange; - Wysiwyg.prototype.getSelectionText = function () { - var range = this.getNativeSelectionRange(); - return range ? range.toString() : null; - }; - Wysiwyg.prototype.getSelectionHTML = function () { - var fragment = this.getSelectionFragment(); - var anonymous = this.contentDocument.createElement("div"); - anonymous.appendChild(fragment); - return anonymous.innerHTML; - }; - Wysiwyg.prototype.getSelectionFragment = function () { - var range = this.getNativeSelectionRange(); - return range ? range.cloneContents() : this.contentDocument.createDocumentFragment(); - }; - Wysiwyg.prototype.getSelectionPosition = function () { - var range = this.getNativeSelectionRange(); - var position = { start: null, end: null }; - if (range) { - position.start = range.startContainer; - position.end = range.endContainer; - } - return position; - }; - Wysiwyg.prototype.selectionContainsTagName = function (name) { - var selection = this.contentWindow.getSelection(); - var range = this.getNativeSelectionRange(); - if (!range) { - return false; - } - var ancestor = range.commonAncestorContainer; - if (!ancestor) { - return false; - } - if (Wysiwyg.getSelfOrAncestor(ancestor, name)) { - return true; - } - if (ancestor.nodeType !== 1) { - return false; - } - var elements = ancestor.getElementsByTagName(name); - var length = elements.length; - var i; - for (i = 0; i < length; i++) { - if (selection.containsNode(elements[i], true)) { - return true; - } - } - return false; - }; - -} else if (document.selection) { - Wysiwyg.prototype.appendBogusLineBreak = function (element) { }; - Wysiwyg.prototype.isBogusLineBreak = function (node) { return false; }; - Wysiwyg.prototype.insertParagraphOnEnter = null; - Wysiwyg.prototype.insertLineBreak = function () { - this.insertHTML("
            "); - }; - Wysiwyg.prototype.insertLineBreakOnShiftEnter = null; - Wysiwyg.prototype.tableHTML = function (id, row, col) { - var html = this._tableHTML(row, col); - return html.replace(//, ''); - }; - Wysiwyg.prototype.insertTableCell = function (row, index) { - return row.insertCell(index); - }; - Wysiwyg.prototype.getFocusNode = function () { - this.contentWindow.focus(); - var d = this.contentDocument; - var range = d.selection.createRange(); - var node = range.item ? range.item(0) : range.parentElement(); - return node.ownerDocument === d ? node : null; - }; - Wysiwyg.prototype.selectNode = function (node) { - var d = this.contentDocument; - var body = d.body; - var range; - d.selection.empty(); - try { - range = body.createControlRange(); - range.addElement(node); - } catch (e) { - range = body.createTextRange(); - range.moveToElementText(node); - } - range.select(); - }; - Wysiwyg.prototype.selectNodeContents = function (node) { - var d = this.contentDocument; - d.selection.empty(); - var range = d.body.createTextRange(); - range.moveToElementText(node); - range.select(); - }; - Wysiwyg.prototype.selectRange = function (start, startOffset, end, endOffset) { - var d = this.contentDocument; - var body = d.body; - d.selection.empty(); - var range = endPoint(start, startOffset); - if (start !== end || startOffset !== endOffset) { - range.setEndPoint("EndToEnd", endPoint(end, endOffset)); - } - range.select(); - - function endPoint(node, offset) { - var range; - if (node.nodeType === 1) { - var childNodes = node.childNodes; - if (offset >= childNodes.length) { - range = body.createTextRange(); - range.moveToElementText(node); - range.collapse(false); - return range; - } - node = childNodes[offset]; - if (node.nodeType === 1) { - range = body.createTextRange(); - range.moveToElementText(node); - range.collapse(true); - switch (node.tagName.toLowerCase()) { - case "table": - range.move("character", -1); - break; - } - return range; - } - return endPoint(node, 0); - } - if (node.nodeType !== 3) { - throw "selectRange: nodeType != @".replace(/@/, node.nodeType); - } - - range = body.createTextRange(); - var element = node.previousSibling; - while (element) { - var nodeType = element.nodeType; - if (nodeType === 1) { - range.moveToElementText(element); - range.collapse(false); - break; - } - if (nodeType === 3) { - offset += element.nodeValue.length; - } - element = element.previousSibling; - } - if (!element) { - range.moveToElementText(node.parentNode); - range.collapse(true); - } - if (offset !== 0) { - range.move("character", offset); - } - return range; - } - }; - Wysiwyg.prototype.getSelectionRange = function () { - var body = this.contentDocument.body; - var pseudo = {}; - var start = this.getNativeSelectionRange(); - if (start.item) { - var element = start.item(0); - var parent = element.parentNode; - var childNodes = parent.childNodes; - var length = childNodes.length; - var i; - - for (i = 0; i < length; i++) { - if (childNodes[i] === element) { - pseudo.startOffset = i; - pseudo.endOffset = i + 1; - break; - } - } - pseudo.collapsed = false; - pseudo.startContainer = pseudo.endContainer = parent; - return pseudo; - } - var end = start.duplicate(); - pseudo.collapsed = start.compareEndPoints("StartToEnd", end) === 0; - start.collapse(true); - end.collapse(false); - - function nextElement(range) { - var parent = range.parentElement(); - var childNodes = parent.childNodes; - var length = childNodes.length; - var i; - for (i = 0; i < length; i++) { - var node = childNodes[i]; - if (node.nodeType === 1) { - var tmp = body.createTextRange(); - tmp.moveToElementText(node); - if (range.compareEndPoints("EndToStart", tmp) <= 0) { - return node; - } - } - } - return null; - } - - function nodeOffset(range, parent, element, index, length) { - var tmp = body.createTextRange(); - var len; - tmp.moveToElementText(element || parent); - tmp.collapse(!!element); - tmp.move("character", -index); - if (!element) { - length++; - } - for (len = length; len >= 0; len--) { - if (tmp.compareEndPoints("EndToStart", range) === 0) { - return len; - } - tmp.move("character", -1); - } - return null; - } - - function setContainerOffset(range, containerKey, offsetKey) { - var parent = range.parentElement(); - var element = nextElement(range); - var index = 0; - var node = element ? element.previousSibling : parent.lastChild; - var offset, length; - while (node && node.nodeType === 3) { - length = node.nodeValue.length; - offset = nodeOffset(range, parent, element, index, length); - if (offset !== null) { - pseudo[containerKey] = node; - pseudo[offsetKey] = offset; - return; - } - index += length; - node = node.previousSibling; - } - var childNodes = parent.childNodes; - length = childNodes.length; - if (length > 0) { - pseudo[containerKey] = parent; - pseudo[offsetKey] = containerKey === "startContainer" ? 0 : length - 1; - return; - } - element = parent; - parent = element.parentNode; - childNodes = parent.childNodes; - length = childNodes.length; - for (offset = 0; offset < length; offset++) { - if (element === childNodes[offset]) { - pseudo[containerKey] = parent; - pseudo[offsetKey] = offset; - return; - } - } - } - - setContainerOffset(start, "startContainer", "startOffset"); - setContainerOffset(end, "endContainer", "endOffset"); - return pseudo; - }; - Wysiwyg.prototype.getNativeSelectionRange = function () { - this.contentWindow.focus(); - return this.contentDocument.selection.createRange(); - }; - Wysiwyg.prototype.getSelectionText = function () { - var range = this.getNativeSelectionRange(); - if (range) { - return range.item ? range.item(0).innerText : range.text; - } - return null; - }; - Wysiwyg.prototype.getSelectionHTML = function () { - var range = this.getNativeSelectionRange(); - if (range) { - return range.item ? range.item(0).innerHTML : range.htmlText; - } - return null; - }; - Wysiwyg.prototype.getSelectionFragment = function () { - var d = this.contentDocument; - var fragment = d.createDocumentFragment(); - var anonymous = d.createElement("div"); - anonymous.innerHTML = this.getSelectionHTML(); - this.collectChildNodes(fragment, anonymous); - return fragment; - }; - Wysiwyg.prototype.getSelectionPosition = function () { - this.contentWindow.focus(); - var d = this.contentDocument; - var range = d.selection.createRange(); - var startNode = null; - var endNode = null; - if (range.item) { - if (range.item(0).ownerDocument === d) { - startNode = range.item(0); - endNode = range.item(range.length - 1); - } - } else { - if (range.parentElement().ownerDocument === d) { - var startRange = range.duplicate(); - startRange.collapse(true); - startNode = startRange.parentElement(); - var endRange = range.duplicate(); - endRange.collapse(false); - endNode = endRange.parentElement(); - } - } - return { start: startNode, end: endNode }; - }; - Wysiwyg.prototype.expandSelectionToElement = function (arg) { - this.contentWindow.focus(); - var d = this.contentDocument; - var body = d.body; - var range = d.selection.createRange(); - var tmp; - if (arg.start) { - tmp = body.createTextRange(); - tmp.moveToElementText(arg.start); - range.setEndPoint("StartToStart", tmp); - } - if (arg.end) { - tmp = body.createTextRange(); - tmp.moveToElementText(arg.end); - range.setEndPoint("EndToEnd", tmp); - } - if (tmp) { - range.select(); - } - }; - Wysiwyg.prototype.selectionContainsTagName = function (name) { - this.contentWindow.focus(); - var d = this.contentDocument; - var selection = d.selection; - var range = selection.createRange(); - var parent = range.item ? range.item(0) : range.parentElement(); - if (!parent) { - return false; - } - if (Wysiwyg.getSelfOrAncestor(parent, name)) { - return true; - } - var elements = parent.getElementsByTagName(name); - var length = elements.length; - var i; - for (i = 0; i < length; i++) { - var testRange = selection.createRange(); - testRange.moveToElementText(elements[i]); - if (range.compareEndPoints("StartToEnd", testRange) <= 0 - && range.compareEndPoints("EndToStart", testRange) >= 0) { - return true; - } - } - return false; - }; - Wysiwyg.prototype.insertHTML = function (html) { - this.contentWindow.focus(); - var selection = this.contentDocument.selection; - var range = selection.createRange(); - range.pasteHTML(html.replace(/\t/g, " ")); - range.collapse(false); - range.select(); - range = this.contentDocument.selection.createRange(); - }; - -} else { - Wysiwyg.prototype.appendBogusLineBreak = function (element) { }; - Wysiwyg.prototype.insertParagraphOnEnter = null; - Wysiwyg.prototype.insertLineBreak = function () { }; - Wysiwyg.prototype.insertTableCell = function (row, index) { return null; }; - Wysiwyg.prototype.getFocusNode = function () { return null; }; - Wysiwyg.prototype.selectNode = function (node) { }; - Wysiwyg.prototype.selectNodeContents = function (node) { return null; }; - Wysiwyg.prototype.selectRange = function (start, startOffset, end, endOffset) { }; - Wysiwyg.prototype.getSelectionRange = function () { return null; }; - Wysiwyg.prototype.getNativeSelectionRange = function () { return null; }; - Wysiwyg.prototype.getSelectionText = function () { return null; }; - Wysiwyg.prototype.getSelectionHTML = function () { return null; }; - Wysiwyg.prototype.getSelectionFragment = function () { return null; }; - Wysiwyg.prototype.getSelectionPosition = function () { return null; }; - Wysiwyg.prototype.expandSelectionToElement = function (arg) { }; - Wysiwyg.prototype.selectionContainsTagName = function (name) { return false; }; - Wysiwyg.prototype.insertHTML = function (html) { }; -} - -Wysiwyg.prototype._treeWalkEmulation = function (root, iterator) { - if (!root.firstChild) { - iterator(null); - return; - } - var element = root; - while (element) { - if (element.firstChild) { - element = element.firstChild; - } else if (element.nextSibling) { - element = element.nextSibling; - } else { - while (true) { - element = element.parentNode; - if (element === root || !element) { - iterator(null); - return; - } - if (element.nextSibling) { - element = element.nextSibling; - break; - } - } - } - iterator(element); - } -}; - -if (document.createTreeWalker) { - Wysiwyg.prototype.treeWalk = function (root, iterator) { - var walker = root.ownerDocument.createTreeWalker( - root, - NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT, - null, - true - ); - while (walker.nextNode()) { - iterator(walker.currentNode); - } - iterator(null); - }; -} else { - Wysiwyg.prototype.treeWalk = Wysiwyg.prototype._treeWalkEmulation; -} - -Wysiwyg.instances = []; -Wysiwyg.count = 0; -Wysiwyg.paths = null; - -Wysiwyg.newInstance = function (textarea, options) { - var instance = new Wysiwyg(textarea, options); - Wysiwyg.instances.push(instance); - return instance; -}; - -Wysiwyg.findInstance = function (textarea) { - var instances = Wysiwyg.instances; - var length = instances.length; - var i; - for (i = 0; i < length; i++) { - var instance = instances[i]; - if (instance.textarea === textarea) { - return instance; - } - } - return null; -}; - -Wysiwyg.getStylePaths = function () { - var stylesheets = []; - var paths = { stylesheets: stylesheets, base: '/' }; - - var d = document; - var head = d.getElementsByTagName("head")[0]; - var links = head.getElementsByTagName("link"); - var length = links.length; - var i; - for (i = 0; i < length; i++) { - var link = links[i]; - var href = link.getAttribute("href") || ""; - var type = link.getAttribute("type") || ""; - switch ((link.getAttribute("rel") || "").toLowerCase()) { - case "wysiwyg.base": - paths.base = href; - break; - case "wysiwyg.stylesheet": - stylesheets.push(href); - break; - } - } - if (paths.base && stylesheets.length > 0) { - return paths; - } - return null; -}; - -Wysiwyg.getOptions = function () { - var options = {}; - if (window._wysiwyg) { - options = _wysiwyg; - } - return options; -}; - -Wysiwyg.getEditorMode = function () { - if (Wysiwyg.editorMode) { - return Wysiwyg.editorMode; - } - - var mode = null; - var cookies = (document.cookie || "").split(";"); - var length = cookies.length; - var i; - for (i = 0; i < length; i++) { - var match = /^\s*wysiwyg=(\S*)/.exec(cookies[i]); - if (match) { - switch (match[1]) { - case "wysiwyg": - mode = match[1]; - break; - default: // "textarea" - mode = null; - break; - } - break; - } - } - - Wysiwyg.editorMode = mode || "textarea"; - return Wysiwyg.editorMode; -}; - -Wysiwyg.setCookie = function (key, val) { - var expires, pieces; - var now = new Date(); - if (!/\/$/.test(Wysiwyg.paths.base)) { - expires = new Date(now.getTime() - 86400000); - pieces = [ key +"=", - "path=" + Wysiwyg.paths.base + "/", - "expires=" + expires.toUTCString() ]; - document.cookie = pieces.join("; "); - } - expires = new Date(now.getTime() + 365 * 86400 * 1000); - pieces = [ key + "=" + val, - "path=" + Wysiwyg.paths.base, - "expires=" + expires.toUTCString() ]; - document.cookie = pieces.join("; "); -}; - -Wysiwyg.removeEvent = function (element, type, func) { - jQuery(element).unbind(type, func); -}; - -Wysiwyg.stopEvent = function (event) { - if (event.preventDefault) { - event.preventDefault(); - event.stopPropagation(); - } else { - event.returnValue = false; - event.cancelBubble = true; - } -}; - -Wysiwyg.setStyle = function (element, object) { - var style = element.style; - var name; - for (name in object) { - style[name] = object[name]; - } -}; - -if (document.defaultView) { - Wysiwyg.getStyle = function (element, name) { - var value = element.style[name]; - if (!value) { - var style = element.ownerDocument.defaultView.getComputedStyle(element, null); - value = style ? style[name] : null; - } - return value; - }; -} else { - Wysiwyg.getStyle = function (element, name) { - return element.style[name] || element.currentStyle[name]; - }; -} - -Wysiwyg.getSelfOrAncestor = function (element, name) { - var target = element; - var d = element.ownerDocument; - if (name instanceof RegExp) { - while (target && target !== d) { - switch (target.nodeType) { - case 1: // element - if (name.test(target.tagName.toLowerCase())) { - return target; - } - break; - case 11: // fragment - return null; - } - target = target.parentNode; - } - } else { - name = name.toLowerCase(); - while (target && target !== d) { - switch (target.nodeType) { - case 1: // element - if (target.tagName.toLowerCase() === name) { - return target; - } - break; - case 11: // fragment - return null; - } - target = target.parentNode; - } - } - return null; -}; - -Wysiwyg.getTextContent = (function () { - var anonymous = document.createElement("div"); - if (typeof anonymous.textContent !== undefined) { - return function (element) { return element.textContent; }; - } else if (typeof anonymous.innerText !== undefined) { - return function (element) { return element.innerText; }; - } else { - return function (element) { return null; }; - } -})(); - -Wysiwyg.initialize = function () { - if ("replace".replace(/[a-e]/g, function (m) { return "*"; }) !== "r*pl***") { - return; - } - if (typeof document.designMode === undefined) { - return; - } - Wysiwyg.paths = Wysiwyg.getStylePaths(); - if (!Wysiwyg.paths) { - return; - } - var options = Wysiwyg.getOptions(); - var textareas = document.getElementsByTagName("textarea"); - var editors = []; - var i; - for (i = 0; i < textareas.length; i++) { - var textarea = textareas[i]; - if (/\bwikitext\b/.test(textarea.className || "")) { - editors.push(Wysiwyg.newInstance(textarea, options)); - } - } - return editors; -}; - -// vim:et:ai:ts=4 +"use strict"; +/*jslint devel: true, undef: true, browser: true, continue: true, sloppy: true, stupid: true, vars: true, plusplus: true, regexp: true, maxerr: 50, indent: 4 */ +/**** + vim:sw=4:et:ai + + Wysiwyg editor for FitNesse, based on the Trac Wysiwyg editor written by + OpenGroove and Ciklone, BSD licensed. + + ****/ + +var Wysiwyg = function (textarea, options) { + var self = this; + var editorMode = Wysiwyg.getEditorMode(); + var body = document.body; + var i; + + this.textarea = textarea; + this.options = options = options || {}; + + this.createEditable(document, textarea); + var frame = this.frame; + + this.contentWindow = frame.contentWindow; + this.contentDocument = this.contentWindow.document; + + this.initializeEditor(this.contentDocument); + this.wysiwygToolbar = this.createWysiwygToolbar(document); + this.textareaToolbar = this.createTextareaToolbar(document); + this.styleMenu = this.createStyleMenu(document); + this.menus = [ this.styleMenu ]; + this.toolbarButtons = this.setupWysiwygMenuEvents(); + this.setupTextareaMenuEvents(); + + this.toggleEditorButtons = null; + this.savedWysiwygHTML = null; + + this.setupToggleEditorButtons(); + this.setupSyncTextAreaHeight(); + + // Hide both editors, so the current one gets properly shown: + textarea.style.display = frame.style.display = "none"; + + this.textarea.parentNode.insertBefore(this.toggleEditorButtons, this.textarea); + this.textarea.parentNode.insertBefore(this.textareaToolbar, this.textarea); + this.textarea.parentNode.insertBefore(this.wysiwygToolbar, this.textarea); + + document.getElementById("wt-style").parentNode.appendChild(this.menus[0]); + + + this.listenerToggleEditor(editorMode)({ initializing: true }); + + function lazySetup() { + if (self.contentDocument.body) { + var exception; + try { self.execCommand("useCSS", false); } catch (e1) { } + try { self.execCommand("styleWithCSS", false); } catch (e2) { } + if (editorMode === "wysiwyg") { + try { self.loadWysiwygDocument(); } catch (e3) { exception = e3; } + } + self.setupEditorEvents(); + self.setupFormEvent(); + if (exception) { + self.textarea.style.display = self.textareaToolbar.style.display = ""; + self.frame.style.display = self.wysiwygToolbar.style.display = "none"; + alert("Failed to activate the wysiwyg editor."); + throw exception; + } + } else { + setTimeout(lazySetup, 100); + } + } + lazySetup(); +}; + +Wysiwyg.prototype.initializeEditor = function (d) { + var l = window.location; + var i; + var html = [ + '\n', + '', + '', + '' + ]; + + var base = Wysiwyg.paths.base.replace(/\/\/*$/, "/"); + if (base) { + html.push(''); + } else { + html.push(''); + } + + var stylesheets = Wysiwyg.paths.stylesheets; + if (!stylesheets) { + // Work around wysiwyg stops with Agilo + stylesheets = [ "editor.css" ]; + } + var length = stylesheets.length; + for (i = 0; i < length; i++) { + html.push(''); + } + + html.push('', '', '', ''); + + var first = !window.opera && d.addEventListener ? true : false; + if (first) { + d.designMode = "On"; + } + d.open(); + d.write(html.join("")); + d.close(); + if (!first) { + d.designMode = "On"; + if (d !== this.contentWindow.document) { + this.contentDocument = this.contentWindow.document; + } + } + // disable firefox table resizing + try { d.execCommand("enableObjectResizing", false, false); } catch (e) {} + try { d.execCommand("enableInlineTableEditing", false, false); } catch (e) {} +}; + +Wysiwyg.getWrapOn = function () { + var mode = false; + var cookies = (document.cookie || "").split(";"); + var length = cookies.length; + var i; + for (i = 0; i < length; i++) { + var match = /^\s*textwrapon=(\S*)/.exec(cookies[i]); + if (match) { + switch (match[1]) { + case "true": + mode = true; + break; + default: + mode = false; + break; + } + break; + } + } + + return mode; +}; + +Wysiwyg.prototype.listenerToggleEditor = function (type) { + var self = this; + var setEditorMode = function (mode) { + switch (mode) { + case "wysiwyg": + break; + default: + mode = "textarea"; + break; + } + Wysiwyg.editorMode = mode; + Wysiwyg.setCookie("wysiwyg", mode); + }; + + + switch (type) { + case "textarea": + return function (event) { + var textarea = self.textarea; + if (textarea.style.display === "none") { + self.hideAllMenus(); + if (event && !event.initializing) { self.loadWikiText(); } + textarea.style.display = ""; + textarea.setAttribute("tabIndex", ""); + self.syncTextAreaHeight(); + self.frame.style.display = self.wysiwygToolbar.style.display = "none"; + self.frame.setAttribute("tabIndex", "-1"); + self.textareaToolbar.style.display = ""; + setEditorMode(type); + } + self.focusTextarea(); + }; + case "wysiwyg": + return function (event) { + var frame = self.frame; + if (frame.style.display === "none") { + try { + self.loadWysiwygDocument(); + } catch (e) { + Wysiwyg.stopEvent(event || window.event); + alert("Failed to activate the wysiwyg editor."); + throw e; + } + self.textarea.style.display = "none"; + self.textarea.setAttribute("tabIndex", "-1"); + frame.style.display = self.wysiwygToolbar.style.display = ""; + frame.setAttribute("tabIndex", ""); + self.textareaToolbar.style.display = "none"; + setEditorMode(type); + } + self.focusWysiwyg(); + }; + } +}; + +Wysiwyg.prototype.activeEditor = function () { + return this.textarea.style.display === "none" ? "wysiwyg" : "textarea"; +}; + +Wysiwyg.prototype.isModified = function () { + return this.savedWysiwygHTML !== null && this.contentDocument.body.innerHTML !== this.savedWysiwygHTML; +} + +Wysiwyg.prototype.setupFormEvent = function () { + var self = this; + + $(this.textarea.form).submit(function (event) { + var textarea = self.textarea; + try { + if (self.activeEditor() === "wysiwyg") { + var body = self.contentDocument.body; + if (self.isModified()) { + self.textarea.value = self.domToWikitext(body, self.options); + } + } + } catch (e) { + Wysiwyg.stopEvent(event || window.event); + } + }); +}; + +Wysiwyg.prototype.createEditable = function (d, textarea) { + var self = this; + var getStyle = Wysiwyg.getStyle; + var wrapper = d.createElement("div"); + wrapper.innerHTML = ''; + var frame = this.frame = wrapper.firstChild; + + textarea.parentNode.insertBefore(frame, textarea.nextSibling); +}; + +Wysiwyg.prototype.createWysiwygToolbar = function (d) { + var html = [ + '', + '
              ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
            ', + '
              ', + '
              • ', + '
              • ', + '
            ', + '
              ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
            ', + '
              ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
            ', + '
              ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
              • ', + '
            ' ]; + var div = d.createElement("div"); + div.className = "wysiwyg-toolbar"; + div.innerHTML = html.join("").replace(/ href="#">/g, ' href="#" onmousedown="return false" tabindex="-1">'); + return div; +}; + +Wysiwyg.prototype.createStyleMenu = function (d) { + var html = [ + '

            Normal

            ', + '

            Header 1

            ', + '

            Header 2

            ', + '

            Header 3

            ', + '

            Header 4

            ', + '
            Header 5
            ', + '
            Header 6
            ', + '
            Code block
            ' ]; + var menu = d.createElement("div"); + menu.className = "wysiwyg-menu"; + Wysiwyg.setStyle(menu, { display: "none" }); + menu.innerHTML = html.join("").replace(/ href="#">/g, ' href="#" onmousedown="return false" tabindex="-1">'); + return menu; +}; + +Wysiwyg.prototype.setupWysiwygMenuEvents = function () { + function addToolbarEvent(element, self, args) { + var method = args.shift(); + $(element).click(function (event) { + var w = self.contentWindow; + Wysiwyg.stopEvent(event || w.event); + var keepMenus = false, exception; + try { keepMenus = method.apply(self, args); } catch (e) { exception = e; } + if (!keepMenus) { + self.hideAllMenus(); + } + element.blur(); + w.focus(); + if (exception) { + throw exception; + } + }); + } + + function argsByType(self, name, element) { + switch (name) { + case "style": + return [ self.toggleMenu, self.styleMenu, element ]; + case "strong": + return [ self.execDecorate, "bold" ]; + case "em": + return [ self.execDecorate, "italic" ]; + case "underline": + return [ self.execDecorate, "underline" ]; + case "strike": + return [ self.execDecorate, "strikethrough" ]; + case "sub": + return [ self.execDecorate, "subscript" ]; + case "sup": + return [ self.execDecorate, "superscript" ]; + case "escape": + return [ self.execDecorate, "escape" ]; + case "remove": + return [ self.execCommand, "removeformat" ]; + case "paragraph": + return [ self.formatParagraph ]; + case "heading1": + return [ self.formatHeaderBlock, "h1" ]; + case "heading2": + return [ self.formatHeaderBlock, "h2" ]; + case "heading3": + return [ self.formatHeaderBlock, "h3" ]; + case "heading4": + return [ self.formatHeaderBlock, "h4" ]; + case "heading5": + return [ self.formatHeaderBlock, "h5" ]; + case "heading6": + return [ self.formatHeaderBlock, "h6" ]; + case "link": + return [ self.createLink ]; + case "unlink": + return [ self.execCommand, "unlink" ]; + case "ol": + return [ self.insertOrderedList ]; + case "ul": + return [ self.insertUnorderedList ]; + case "outdent": + return [ self.outdent ]; + case "indent": + return [ self.indent ]; + case "table": + return [ self.insertTable ]; + case "insert-cell-before": + return [ self.ui_insertTableCell, false ]; + case "insert-cell-after": + return [ self.ui_insertTableCell, true ]; + case "insert-row-before": + return [ self.insertTableRow, false ]; + case "insert-row-after": + return [ self.insertTableRow, true ]; + case "insert-col-before": + return [ self.insertTableColumn, false ]; + case "insert-col-after": + return [ self.insertTableColumn, true ]; + case "delete-cell": + return [ self.deleteTableCell ]; + case "delete-row": + return [ self.deleteTableRow ]; + case "delete-col": + return [ self.deleteTableColumn ]; + case "remove-table": + return [ self.deleteTable ]; + case "code": + return [ self.formatCodeBlock ]; + case "hr": + return [ self.insertHorizontalRule ]; + case "br": + return [ self.insertLineBreak ]; + case "collapsable-closed": + return [ self.insertCollapsableSection, "collapsed" ]; + case "collapsable-open": + return [ self.insertCollapsableSection ]; + case "collapsable-hidden": + return [ self.insertCollapsableSection, "hidden" ]; + case "remove-collapsable": + return [ self.deleteCollapsableSection ]; + } + return null; + } + + function setup(container) { + var elements = container.getElementsByTagName("a"); + var length = elements.length; + var i; + for (i = 0; i < length; i++) { + var element = elements[i]; + var name = element.id.replace(/^wt-/, ""); + var args = argsByType(this, name, element); + if (args) { + addToolbarEvent(element, this, args); + buttons[name] = element; + } + } + } + + var buttons = {}, i; + setup.call(this, this.wysiwygToolbar); + for (i = 0; i < this.menus.length; i++) { + setup.call(this, this.menus[i]); + } + return buttons; +}; + +Wysiwyg.prototype.createTextareaToolbar = function (d) { + var html = [ + '', + '', + '', + '', + '', + '' ]; + var div = d.createElement("div"); + div.className = "textarea-toolbar"; + div.innerHTML = html.join(" "); + return div; +}; + +Wysiwyg.prototype.setupTextareaMenuEvents = function () { + var textarea = this.textarea; + var container = this.textareaToolbar; + + $('#tt-spreadsheet-to-wiki', container).click(function () { + var translator = new SpreadsheetTranslator(); + translator.parseExcelTable(textarea.value); + textarea.value = translator.getFitNesseTables(); + textarea.focus(); + }); + $('#tt-wiki-to-spreadsheet', container).click(function () { + var selection = textarea.value; + selection = selection.replace(/\r\n/g, '\n'); + selection = selection.replace(/\r/g, '\n'); + // remove the last | at the end of the line + selection = selection.replace(/\|\n/g, '\n'); + // replace all remaining | with \t + selection = selection.replace(/\|/g, '\t'); + textarea.value = selection; + textarea.focus(); + }); + + $('#tt-format-wiki', container).click(function () { + var formatter = new WikiFormatter(); + textarea.value = formatter.format(textarea.value); + textarea.focus(); + }); + + $('#tt-insert-template', container).click(function () { + var selectedValue = $('#tt-template-map').val(); + var inserter = new TemplateInserter(); + inserter.insertInto(selectedValue, textarea); + textarea.focus(); + }); + + function setWrap(wrap) { + if (textarea.wrap) { + textarea.wrap = wrap ? 'soft' : 'off'; + } else { // wrap attribute not supported - try Mozilla workaround + textarea.setAttribute('wrap', wrap ? 'soft' : 'off'); + } + if (wrap) { + $(textarea).removeClass('no_wrap'); + Wysiwyg.setCookie("textwrapon", "true"); + } else { + $(textarea).addClass('no_wrap'); + Wysiwyg.setCookie("textwrapon", "false"); + } + } + + $('#tt-wrap-text', container) + .change(function () { + setWrap($(this).is(':checked')); + }) + .prop('checked', Wysiwyg.getWrapOn()) + .change(); +}; + +Wysiwyg.prototype.toggleMenu = function (menu, element) { + if (menu.style.display === "none") { + this.hideAllMenus(menu); + Wysiwyg.setStyle(menu, { display: "" }); + } else { + this.hideAllMenus(); + } + return true; +}; + +Wysiwyg.prototype.hideAllMenus = function (except) { + var menus = this.menus; + var length = menus.length; + var i; + for (i = 0; i < length; i++) { + if (menus[i] !== except) { + Wysiwyg.setStyle(menus[i], { display: "none" }); + } + } +}; + +Wysiwyg.prototype.execDecorate = function (name) { + if (this.selectionContainsTagName("pre")) { + return; + } + var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; + var position = this.getSelectionPosition(); + var ancestor = {}; + ancestor.start = getSelfOrAncestor(position.start, /^(?:a|tt)$/); + ancestor.end = getSelfOrAncestor(position.end, /^(?:a|tt)$/); + this.expandSelectionToElement(ancestor); + + if (name !== "escape") { + this.execCommand(name); + } else { + this.execDecorateMonospace(); + } + this.selectionChanged(); +}; + +Wysiwyg.prototype.execDecorateMonospace = function () { + var html = this.getSelectionHTML(); + if (/^/i.test(html) && /<\/tt>$/i.test(html)) { + html = html.replace(/|<\/tt>/gi, ""); + } else { + html = '' + html.replace(/<[a-z]+.*?>|<\/[a-z]+>/gi, "") + ""; + } + this.insertHTML(html); + var node = this.contentDocument.getElementById(id); + if (node) { + this.selectNode(node); + } +}; + +Wysiwyg.prototype.execCommand = function (name, arg) { + return this.contentDocument.execCommand(name, false, arg); +}; + +Wysiwyg.prototype.setupEditorEvents = function () { + var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; + var self = this; + var d = this.contentDocument; + var ime = false; + var inPasteAction = false; + + $(d).keydown(function (event) { + var method = null; + var args = null; + event = event || self.contentWindow.event; + var keyCode = event.keyCode; + switch (keyCode) { + case 0x09: // TAB + var range = self.getSelectionRange(); + var stop = false; + var element = getSelfOrAncestor(range.startContainer, /^(?:li|pre|table)$/); + if (element) { + switch (element.tagName.toLowerCase()) { + case "li": + self.execCommand(event.shiftKey ? "outdent" : "indent"); + self.selectionChanged(); + stop = true; + break; + case "pre": + self.insertHTML("\t"); + stop = true; + break; + case "table": + if (getSelfOrAncestor(range.endContainer, "table") === element) { + self.moveFocusInTable(!event.shiftKey); + self.selectionChanged(); + stop = true; + } + break; + } + } + if (stop) { + Wysiwyg.stopEvent(event); + } + return; + case 0xe5: + ime = true; + break; + } + switch ((keyCode & 0x00fffff) | (event.ctrlKey ? 0x40000000 : 0) + | (event.shiftKey ? 0x20000000 : 0) | (event.altKey ? 0x10000000 : 0)) { + case 0x40000042: // C-b + method = self.execDecorate; + args = [ "bold" ]; + break; + case 0x40000049: // C-i + method = self.execDecorate; + args = [ "italic" ]; + break; + case 0x4000004c: // C-l + method = self.toggleAutolink; + args = []; + break; + case 0x40000055: // C-u + method = self.execDecorate; + args = [ "underline" ]; + break; + case 0x40000059: // C-y + method = self.execCommand; + args = [ "redo" ]; + break; + case 0x4000005a: // C-z + method = self.execCommand; + args = [ "undo" ]; + break; + } + if (method !== null) { + Wysiwyg.stopEvent(event); + method.apply(self, args); + self.selectionChanged(); + } else if (keyCode && !inPasteAction) { + var focus = self.getFocusNode(); + if (!getSelfOrAncestor(focus, /^(?:p|li|h[1-6]|t[dh]|d[td]|pre|blockquote)$/)) { + self.execCommand("formatblock", "

            "); + } + } + }); + + $(d).keypress(function (event) { + event = event || self.contentWindow.event; + var modifier = (event.ctrlKey ? 0x40000000 : 0) + | (event.shiftKey ? 0x20000000 : 0) | (event.altKey ? 0x10000000 : 0); + switch (event.charCode || event.keyCode) { + case 0x20: // SPACE + self.detectLink(event); + return; + case 0x3e: // ">" + self.detectLink(event); + return; + case 0x0d: // ENTER + self.detectLink(event); + switch (modifier) { + case 0: + var focus = self._getFocusForTable(); + if (focus.table && focus.cell) { + self.insertTableRow(true); + Wysiwyg.stopEvent(event); + } else if (self.insertParagraphOnEnter) { + self.insertParagraphOnEnter(event); + } + break; + case 0x20000000: // Shift + if (self.insertLineBreakOnShiftEnter) { + self.insertLineBreakOnShiftEnter(event); + } + break; + } + return; + case 0x7c: // "|" + case 28: // ctrl-"|" + var range = self.getSelectionRange(); + var element = getSelfOrAncestor(range.startContainer, "table"); + if (element && + getSelfOrAncestor(range.endContainer, "table") === element && + !getSelfOrAncestor(range.endContainer, /^(?:tt)/)) { + if (event.ctrlKey) { + self.deleteTableCell(); + } else { + self.ui_insertTableCell(true); + } + Wysiwyg.stopEvent(event); + } + return; + } + }); + + $(d).keyup(function (event) { + var keyCode = event.keyCode; + if (ime) { + switch (keyCode) { + case 0x20: // SPACE + self.detectLink(event); + break; + } + ime = false; + } + if (self.getSelectionRange()) { + self.updateElementClassName(self.getSelectionRange().startContainer); + } + self.selectionChanged(); + }); + + $(d).mouseup(function () { + self.selectionChanged(); + }); + + $(d).click(function () { + self.hideAllMenus(); + self.selectionChanged(); + }); + + $(d).on('click', 'div.collapsable', function (event) { + var x = event.pageX - this.offsetLeft; + var y = event.pageY - this.offsetTop; + if (x < 15 && y < 15) { + var e = $(this); + if (e.hasClass('collapsed')) { + e.removeClass('collapsed').addClass('hidden'); + } else if (e.hasClass('hidden')) { + e.removeClass('hidden'); + } else { + e.addClass('collapsed'); + } + event.stopPropagation(); + } + }); + + $(d).on('click', 'a', function () { + return false; + }); + + /* Pasting data is forced in a specific div: pasteddata. In there, the + * raw data is collected and fed to the wikiToDom parser. + */ + $(d).on('paste', 'body', function () { + function tagNode(node) { while (node.nodeType === 3 /* TextNode */) { node = node.parentNode; } return node; } + + // Clone state is change in Firefox, need to extract the fields + var range = self.getSelectionRange(); + + var position = { + startContainer: range.startContainer, + endContainer: range.startContainer === range.endContainer ? range.startContainer.nextSibling : range.endContainer, + sameContainer: range.startContainer === range.endContainer, + atStart: range.startOffset === 0, + atEnd: range.endOffset === range.endContainer.length + }; + inPasteAction = true; + + // Move tables up to the table they're pasted in + function flattenTable(td) { + var nestedRows = $('tr', td); + if (nestedRows.length) { + var parentTr = getSelfOrAncestor(td, 'tr'); + nestedRows.each(function(j, elem) { + $(parentTr).after(elem); + parentTr = $(parentTr).next(); + }); + self.spanTableColumns(getSelfOrAncestor(parentTr, 'table')); + } + + } + // Post processing: + setTimeout(function () { + inPasteAction = false; + + var parentTd = getSelfOrAncestor(position.startContainer, 'td'); + + if (parentTd) { + flattenTable(parentTd); + + // Make a one-liner for the content pasted in the table cell + var wikiText = self.domToWikitext(parentTd, self.options); + var fragment = self.wikitextToOnelinerFragment(wikiText.replace('\n', ' '), self.contentDocument, self.options); + while (parentTd.firstChild) { parentTd.removeChild(parentTd.firstChild); } + parentTd.appendChild(fragment); + + flattenTable(parentTd); + + } else if (position.sameContainer) { + var c = tagNode(position.startContainer); + var wikiText = self.domToWikitext(c, { retainNewLines: true }); + var fragment = self.wikitextToFragment(wikiText, self.contentDocument); + c.parentNode.insertBefore(fragment, c); + c.parentNode.removeChild(c); + // NOTE: At this point the position object is invalid/not useful. + } + }, 20); + }); +}; + +Wysiwyg.prototype.loadWysiwygDocument = function () { + var d = this.contentDocument; + var container = d.body; + if (!container) { return; } + var tmp = container.lastChild; + + while (tmp) { + container.removeChild(tmp); + tmp = container.lastChild; + } + var fragment = this.wikitextToFragment(this.textarea.value, d, this.options); + container.appendChild(fragment); + this.savedWysiwygHTML = container.innerHTML; +}; + +Wysiwyg.prototype.focusWysiwyg = function () { + var self = this; + var w = this.contentWindow; + function lazy() { + w.focus(); + try { self.execCommand("useCSS", false); } catch (e1) { } + try { self.execCommand("styleWithCSS", false); } catch (e2) { } + self.selectionChanged(); + $(window).resize(); + } + setTimeout(lazy, 10); +}; + +Wysiwyg.prototype.loadWikiText = function () { + this.textarea.value = this.domToWikitext(this.contentDocument.body, this.options); + this.savedWysiwygHTML = null; +}; + +Wysiwyg.prototype.focusTextarea = function () { + this.textarea.focus(); + $(window).resize(); +}; + +Wysiwyg.prototype.setupToggleEditorButtons = function () { + var div = document.createElement("div"); + var mode = Wysiwyg.editorMode; + var html = ' ' + + ' ' + + '  '; + var buttons; + var i; + + div.className = "editor-toggle"; + div.innerHTML = html.replace(/@/g, ++Wysiwyg.count); + this.toggleEditorButtons = div; + + buttons = div.getElementsByTagName("input"); + for (i = 0; i < buttons.length; i++) { + var button = buttons[i]; + var token = button.id.replace(/[0-9]+$/, "@"); + switch (token) { + case "editor-wysiwyg-@": + case "editor-textarea-@": + $(button).click(this.listenerToggleEditor(button.value)); + break; + } + } +}; + +Wysiwyg.prototype.setupSyncTextAreaHeight = function () { + var self = this; + var d = document; + var timer = null; + + var editrows = document.getElementById("editrows"); + if (editrows) { + $(editrows).change(changeHeight); + } + + function changeHeight() { + if (timer !== null) { + clearTimeout(timer); + } + setTimeout(sync, 10); + } + + function sync() { + timer = null; + self.syncTextAreaHeight(); + } +}; + +Wysiwyg.prototype.syncTextAreaHeight = function () { + var height = this.textarea.offsetHeight; + var frame = this.frame; + if (height > 0 && frame.height !== height) { + frame.height = height; + } +}; + +Wysiwyg.prototype.detectLink = function (event) { + var range = this.getSelectionRange(); + var node = range.startContainer; + if (!node || !range.collapsed) { + return; + } + var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; + if (getSelfOrAncestor(node, /^(?:a|tt|pre)$/)) { + return; + } + + var offset = range.startOffset; + if (node.nodeType !== 3) { + node = node.childNodes[offset]; + while (node && node.nodeType !== 3) { + node = node.lastChild; + } + if (!node) { + return; + } + offset = node.nodeValue.length; + } else if (offset === 0) { + node = node.previousSibling; + if (!node || node.nodeType === 1) { + return; + } + offset = node.nodeValue.length; + } + var startContainer = node; + var endContainer = node; + var text = [ node.nodeValue.substring(0, offset) ]; + while (true) { + if (/[ \t\r\n\f\v]/.test(text[text.length - 1])) { + break; + } + node = node.previousSibling; + if (!node || node.nodeType === 1) { + break; + } + text.push(node.nodeValue); + startContainer = node; + } + text.reverse(); + text = text.join(""); + if (!text) { + return; + } + + var pattern = this.wikiDetectLinkPattern; + pattern.lastIndex = /[^ \t\r\n\f\v]*$/.exec(text).index; + var match, tmp; + for (tmp = pattern.exec(text); tmp; tmp = pattern.exec(text)) { + match = tmp; + } + if (!match) { + return; + } + + var label = match[0]; + var link = this.normalizeLink(label); + var id = this.generateDomId(); + var anchor = this.createAnchor(link, label, { id: id, "data-wysiwyg-autolink": "true" }); + var anonymous = this.contentDocument.createElement("div"); + anonymous.appendChild(anchor); + var html = anonymous.innerHTML; + + node = endContainer; + var startOffset = match.index; + while (startContainer !== node && startOffset >= startContainer.nodeValue.length) { + startOffset -= startContainer.nodeValue.length; + startContainer = startContainer.nextSibling; + } + var endOffset = startOffset + label.length; + endContainer = startContainer; + while (endContainer !== node && endOffset >= endContainer.nodeValue.length) { + endOffset -= endContainer.nodeValue.length; + endContainer = endContainer.nextSibling; + } + this.selectRange(startContainer, startOffset, endContainer, endOffset); + + offset = text.length - match.index - label.length; + if (offset === 0) { + switch (event.keyCode) { + case 0x20: // SPACE + this.insertHTML(html + "\u00a0"); + Wysiwyg.stopEvent(event); + return; + case 0x0d: // ENTER + if (event.shiftKey) { + if (window.opera || !anonymous.addEventListener) { + this.insertHTML(html + "
            "); + if (window.opera) { + anchor = this.contentDocument.getElementById(id); + node = anchor.parentNode; + offset = node.childNodes.length; + this.selectRange(node, offset, node, offset); + } + Wysiwyg.stopEvent(event); + return; + } + } + this.insertHTML(html); + anchor = this.contentDocument.getElementById(id); + node = event.shiftKey ? anchor.parentNode : anchor; + offset = node.childNodes.length; + this.selectRange(node, offset, node, offset); + return; + } + } + this.insertHTML(html); + anchor = this.contentDocument.getElementById(id); + node = anchor.nextSibling; + if (!node) { + node = anchor.parentNode; + offset = node.childNodes.length; + } + this.selectRange(node, offset, node, offset); +}; + +Wysiwyg.prototype.outdent = function () { + if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { + return; + } + this.execCommand("outdent"); +}; + +Wysiwyg.prototype.indent = function () { + if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { + return; + } + this.execCommand("indent"); +}; + +Wysiwyg.prototype.formatParagraph = function () { + if (this.selectionContainsTagName("table")) { + return; + } + this.execCommand("formatblock", "

            "); + this.selectionChanged(); +}; + +Wysiwyg.prototype.formatHeaderBlock = function (name) { + if (this.selectionContainsTagName("table")) { + return; + } + this.execCommand("formatblock", "<" + name + ">"); + this.selectionChanged(); +}; + +Wysiwyg.prototype.insertOrderedList = function () { + if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { + return; + } + this.execCommand("insertorderedlist"); + this.selectionChanged(); +}; + +Wysiwyg.prototype.insertUnorderedList = function () { + if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { + return; + } + this.execCommand("insertunorderedlist"); + this.selectionChanged(); +}; + +Wysiwyg.prototype.insertTable = function () { + if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { + return; + } + var id = this.generateDomId(); + this.insertHTML(this.tableHTML(id, 2, 2)); + var element = this.contentDocument.getElementById(id); + if (element) { + this.selectNodeContents(element); + } + this.selectionChanged(); +}; + +Wysiwyg.prototype._tableHTML = function (row, col) { + var tr = "" + ((1 << col) - 1).toString(2).replace(/1/g, "") + ""; + var html = [ + '', '', + ((1 << row) - 1).toString(2).replace(/1/g, tr), + '', '
            ' ]; + return html.join(""); +}; + +Wysiwyg.prototype._getFocusForTable = function () { + var hash = { node: null, cell: null, row: null, table: null }; + hash.node = this.getFocusNode(); + hash.cell = hash.node ? Wysiwyg.getSelfOrAncestor(hash.node, /^t[dh]$/) : null; + hash.row = hash.cell ? Wysiwyg.getSelfOrAncestor(hash.cell, "tr") : null; + hash.table = hash.row ? Wysiwyg.getSelfOrAncestor(hash.row, "table") : null; + + return hash; +}; + +Wysiwyg.prototype.ui_insertTableCell = function (after) { + var focus = this._getFocusForTable(); + if (focus.table && focus.cell) { + var row = focus.table.rows[focus.row.rowIndex]; + var cellIndex = focus.cell.cellIndex + (after ? 1 : 0); + $(focus.cell).removeAttr('colspan'); + var cell = this.insertTableCell(row, Math.min(cellIndex, row.cells.length)); + this.spanTableColumns(focus.table); + this.selectNodeContents(cell); + this.selectionChanged(); + cell.focus(); + } +}; + +Wysiwyg.prototype.insertTableRow = function (after) { + var focus = this._getFocusForTable(); + if (focus.table && focus.row) { + var d = this.contentDocument; + var cells = focus.row.getElementsByTagName("td"); + var row = focus.table.insertRow(focus.row.rowIndex + (after ? 1 : 0)); + var cell; + var j; + for (j = 0; j < cells.length; j++) { + cell = this.insertTableCell(row, 0); + } + this.spanTableColumns(focus.table); + this.selectNodeContents(cell); + this.selectionChanged(); + cell.focus(); + return row; + } +}; + +Wysiwyg.prototype.insertTableColumn = function (after) { + var focus = this._getFocusForTable(); + if (focus.table && focus.cell) { + var d = this.contentDocument; + var rows = focus.table.rows; + var length = rows.length; + var cellIndex = focus.cell.cellIndex + (after ? 1 : 0); + var i; + for (i = 1; i < length; i++) { + var row = rows[i]; + this.insertTableCell(row, Math.min(cellIndex, row.cells.length)); + } + this.spanTableColumns(focus.table); + } +}; + +Wysiwyg.prototype.deleteTableCell = function () { + var focus = this._getFocusForTable(); + if (focus.table && focus.cell) { + var row = focus.table.rows[focus.row.rowIndex]; + var cellIndex = focus.cell.cellIndex; + if (cellIndex < row.cells.length) { + row.deleteCell(cellIndex); + } + this.spanTableColumns(focus.table); + //this.selectNode(row.cells[cellIndex < row.cells.length ? cellIndex : row.cells.length - 1].firstChild); + this.moveFocusInTable(false); + } +}; + +Wysiwyg.prototype.deleteTableRow = function () { + var focus = this._getFocusForTable(); + if (focus.table && focus.row) { + focus.table.deleteRow(focus.row.rowIndex); + this.spanTableColumns(focus.table); + } +}; + +Wysiwyg.prototype.deleteTableColumn = function () { + var focus = this._getFocusForTable(); + if (focus.table && focus.cell) { + var rows = focus.table.rows; + var length = rows.length; + var cellIndex = focus.cell.cellIndex; + var i; + for (i = 1; i < length; i++) { + var row = rows[i]; + if (cellIndex < row.cells.length) { + row.deleteCell(cellIndex); + } + } + this.spanTableColumns(focus.table); + } +}; + +Wysiwyg.prototype.deleteTable = function () { + var focus = this._getFocusForTable(); + if (focus.table) { + $(focus.table).remove(); + } +}; + +Wysiwyg.prototype.spanTableColumns = function (table) { + // Spanning columns fitnesse style. + var maxCells = Math.max.apply(Math, $.map($('tr', table), function (e) { + var tds = $('td', e); + tds.removeAttr('colspan'); + return tds.size(); + })); + $('tr', table).each(function () { + var s = $('td', this).size(); + if (s < maxCells) { + $('td:last', this).attr('colspan', maxCells - s + 1); + } + }); +}; + +Wysiwyg.prototype.moveFocusInTable = function (forward) { + var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; + var focus = this.getFocusNode(); + var element = getSelfOrAncestor(focus, /^(?:t[dhr]|table)$/); + var target, table, rows, cells; + switch (element.tagName.toLowerCase()) { + case "td": + case "th": + focus = element; + var row = getSelfOrAncestor(element, "tr"); + cells = row.cells; + if (forward) { + if (focus.cellIndex + 1 < cells.length) { + target = cells[focus.cellIndex + 1]; + } else { + table = getSelfOrAncestor(row, /^(?:tbody|table)$/); + rows = table.rows; + target = row.rowIndex + 1 < rows.length ? rows[row.rowIndex + 1].cells[0] : null; + } + } else { + if (focus.cellIndex > 0) { + target = cells[focus.cellIndex - 1]; + } else { + table = getSelfOrAncestor(row, /^(?:tbody|table)$/); + rows = table.rows; + if (row.rowIndex > 0) { + cells = rows[row.rowIndex - 1].cells; + target = cells[cells.length - 1]; + } else { + target = null; + } + } + } + break; + case "tr": + cells = element.cells; + target = cells[forward ? 0 : cells.length - 1]; + break; + case "tbody": + case "table": + rows = element.rows; + cells = rows[forward ? 0 : rows.length - 1].cells; + target = cells[forward ? 0 : cells.length - 1]; + break; + } + if (target) { + this.selectNodeContents(target); + } else if (table) { + table = getSelfOrAncestor(table, "table"); + var parent = table.parentNode; + var elements = parent.childNodes; + var length = elements.length; + var offset; + for (offset = 0; offset < length; offset++) { + if (table === elements[offset]) { + if (forward) { + offset++; + } + this.selectRange(parent, offset, parent, offset); + } + } + } +}; + +Wysiwyg.prototype.formatCodeBlock = function () { + if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { + return; + } + var text = this.getSelectionText(); + if (!text) { + var node = this.getFocusNode(); + while (node.nodeType === 3) { + node = node.parentNode; + } + text = Wysiwyg.getTextContent(node); + this.selectNode(node); + } + + var fragment = this.getSelectionFragment(); + text = this.domToWikitext(fragment).replace(/\s+$/, ""); + + var d = this.contentDocument; + var anonymous = d.createElement("div"); + var pre = d.createElement("pre"); + pre.className = "wiki"; + anonymous.appendChild(pre); + if (text) { + pre.appendChild(d.createTextNode(text)); + } + + this.insertHTML(anonymous.innerHTML); + this.selectionChanged(); +}; + +Wysiwyg.prototype.insertHorizontalRule = function () { + if (this.selectionContainsTagName("table") || this.selectionContainsTagName("pre")) { + return; + } + if (!this.execCommand("inserthorizontalrule")) { + this.insertHTML("

            "); + } + this.selectionChanged(); +}; + +Wysiwyg.prototype.insertCollapsableSection = function (mode) { + var self = this; + var range = this.getSelectionRange(); + var html = this.getSelectionHTML(); + var d = this.contentDocument; + + function topNode(node) { + while (node.parentNode && node.parentNode !== self.contentDocument.body) { + node = node.parentNode; + } + return node; + } + + var nodes; + var start = topNode(range.startContainer); + if (range.startContainer === range.endContainer) { + nodes = range.startOffset === range.endOffset ? [] : [ topNode(range.startContainer) ]; + } else { + var end = topNode(range.endContainer); + nodes = []; + for (var node = start; node !== end; node = node.nextSibling) { + nodes.push(node); + } + nodes.push(end); + } + + var classes = ""; + if (mode) { classes = " " + mode; } + var collapsible = d.createElement("div"); + collapsible.setAttribute("class", "collapsable" + classes); + start.parentNode.insertBefore(collapsible, start); + var sectionName = d.createElement("p"); + sectionName.appendChild(d.createTextNode("section title")); + collapsible.appendChild(sectionName); + for (var node in nodes) { + collapsible.appendChild(nodes[node]); + } + + this.selectNode(sectionName); +}; + +Wysiwyg.prototype.deleteCollapsableSection = function () { + var pos = this.getSelectionPosition(); + var startCol = $(pos.start).parents("div.collapsable")[0]; + var endCol = $(pos.end).parents("div.collapsable")[0]; + if (startCol === endCol) { + $(startCol).before($(startCol).children()); + $(startCol).remove(); + } +}; + +Wysiwyg.prototype.createLink = function () { + if (this.selectionContainsTagName("pre")) { + return; + } + + var focus = this.getFocusNode(); + var anchor = Wysiwyg.getSelfOrAncestor(focus, "a"); + var expand = anchor || Wysiwyg.getSelfOrAncestor(focus, "tt"); + var currLink; + if (anchor) { + var autolink = anchor.getAttribute("data-wysiwyg-autolink"); + + if (autolink === "true") { + var pattern = this.wikiDetectLinkPattern; + pattern.lastIndex = 0; + var label = Wysiwyg.getTextContent(anchor); + var match = pattern.exec(label); + if (match && match.index === 0 && match[0].length === label.length) { + currLink = this.normalizeLink(label); + } + } + if (!currLink) { + currLink = anchor.getAttribute("data-wysiwyg-link") || anchor.href; + } + } else { + currLink = ""; + } + if (expand) { + this.selectNodeContents(expand); + } + var text = this.getSelectionText() || ""; + var newLink = (prompt(text ? "Enter link:" : "Insert link:", currLink) || "").replace(/^\s+|\s+$/g, ""); + if (newLink && newLink !== currLink) { + text = text || newLink; + newLink = this.normalizeLink(newLink); + var id = this.generateDomId(); + var d = this.contentDocument; + var anonymous = d.createElement("div"); + anchor = this.createAnchor(newLink, text, { id: id }); + anonymous.appendChild(anchor); + this.insertHTML(anonymous.innerHTML); + anchor = d.getElementById(id); + if (anchor) { + this.selectNodeContents(anchor); + } + } + this.selectionChanged(); +}; + +Wysiwyg.prototype.createAnchor = function (link, label, attrs) { + var d = this.contentDocument; + var anchor = d.createElement("a"); + var name; + for (name in attrs) { + var value = attrs[name]; + anchor.setAttribute(name, value); + } + anchor.href = link; + anchor.title = link; + anchor.setAttribute("data-wysiwyg-link", link); + if (label) { + anchor.appendChild(d.createTextNode(label)); + } + return anchor; +}; + +Wysiwyg.prototype.createCollapsableSection = function () { + var collapsible = this.contentDocument.createElement("div"); + + $(collapsible).addClass("collapsable"); + return collapsible; +}; + +Wysiwyg.prototype.collectChildNodes = function (dest, source) { + var childNodes = source.childNodes; + var i; + for (i = childNodes.length - 1; i >= 0; i--) { + dest.insertBefore(childNodes[i], dest.firstChild); + } +}; + +Wysiwyg.prototype.generateDomId = function () { + var d = this.contentDocument; + while (true) { + var id = "tmp-" + (new Date().valueOf().toString(36)); + if (!d.getElementById(id)) { + return id; + } + } +}; + +Wysiwyg.prototype.selectionChanged = function () { + var status = { + strong: false, + em: false, + underline: false, + strike: false, + sub: false, + sup: false, + escape: false, + paragraph: false, + heading1: false, + heading2: false, + heading3: false, + heading4: false, + heading5: false, + heading6: false, + link: false, + ol: false, + ul: false, + outdent: false, + indent: false, + table: false, + code: false, + quote: false, + hr: false, + br: false + }; + var tagNameToKey = { + b: "strong", + i: "em", + u: "underline", + del: "strike", + tt: "escape", + p: "paragraph", + h1: "heading1", + h2: "heading2", + h3: "heading3", + h4: "heading4", + h5: "heading5", + h6: "heading6", + a: "link", + pre: "code" + }; + var position = this.getSelectionPosition(); + var node, toolbarButtons, name; + + if (position.start) { + node = position.start === position.end ? position.start.firstChild : position.start.nextSibling; + node = node || position.start; + } else { + node = null; + } + while (node) { + if (node.nodeType === 1) { + name = node.tagName.toLowerCase(); + if (tagNameToKey.hasOwnProperty(name)) { + name = tagNameToKey[name]; + } + status[name] = true; + } + node = node.parentNode; + } + + toolbarButtons = this.toolbarButtons; + for (name in status) { + var button = toolbarButtons[name]; + if (button) { + var parent = button.parentNode; + parent.className = (parent.className || "").replace(/ *\bselected\b|$/, status[name] ? " selected" : ""); + } + } + + if (status["table"]) { + $(".wysiwyg-toolbar .non-table").hide(); + $(".wysiwyg-toolbar .in-table").show(); + } else { + $(".wysiwyg-toolbar .in-table").hide(); + $(".wysiwyg-toolbar .non-table").show(); + } + $(window).resize(); + + var styles = [ "quote", "paragraph", "code", "heading1", + "heading2", "heading3", "heading4", "heading5", "heading6" ]; + var styleButton = toolbarButtons.style; + var styleButtonClass = "wysiwyg-menu-style"; + var i; + for (i = 0; i < styles.length; i++) { + name = styles[i]; + if (status[name]) { + styleButtonClass = "wysiwyg-menu-" + name; + break; + } + } + styleButton.parentNode.className = styleButtonClass; +}; + +(function () { + var _linkScheme = "[a-zA-Z][a-zA-Z0-9+-.]*"; + // cf. WikiSystem.XML_NAME, http://www.w3.org/TR/REC-xml/#id + var _xmlName = "[:_A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD](?:[-:_.A-Za-z0-9\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]*[-_A-Za-z0-9\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD])?"; + var _quotedString = "'[^']+'|" + '"[^"]+"'; + var _wikiPageName = "(?:\\B[\\.<>]|\\b)[A-Z][a-z]+(?:[A-Z][a-z0-9]*)+(?:\\.[A-Z][a-z]+(?:[A-Z][a-z0-9]*)+)*"; + var _wikiTextLink = "\\[\\[(?:.*?)\\]\\[(?:.*?)\\]\\]"; + var wikiInlineRules = []; + wikiInlineRules.push("'''''"); // 1. bolditalic -> badly supported by FitNesse parser + wikiInlineRules.push("'''"); // 2. bold + wikiInlineRules.push("''"); // 3. italic + wikiInlineRules.push("--"); // 4. strike + wikiInlineRules.push("\\{\\{\\{"); // 5. code block (open) + wikiInlineRules.push("\\}\\}\\}"); // 6. code block (close) + wikiInlineRules.push("![-<{(\\[]"); // 7. escaped (open) + wikiInlineRules.push("[->})\\]]!"); // 8. escaped (close) + wikiInlineRules.push(_wikiTextLink); // 9. Wiki link + wikiInlineRules.push(_wikiPageName); // 10. WikiPageName + + var wikiRules = []; + // -1. header + wikiRules.push("^[ \\t\\r\\f\\v]*![1-6][ \\t\\r\\f\\v]+.*?(?:#" + _xmlName + ")?[ \\t\\r\\f\\v]*$"); + // -2. list + wikiRules.push("^[ \\t\\r\\f\\v]*[*1-9-][ \\t\\r\\f\\v]"); + // -3. definition and comment + wikiRules.push("^(?:![a-z]|#)"); + // -4. closing table row + wikiRules.push("\\|[ \\t\\r\\f\\v]*$"); + // -5. cell + wikiRules.push("^-?!?\\||\\|"); + // -6: open collapsible section + wikiRules.push("^!\\*+[<>]?(?:[ \\t\\r\\f\\v]*|[ \\t\\r\\f\\v]+.*)$"); + // -7: close collapsible section + wikiRules.push("^\\*+!$"); + + wikiRules = wikiRules.concat(wikiInlineRules); + + // TODO could be removed? + var wikiDetectLinkRules = [ _wikiPageName ]; + + + var domToWikiInlinePattern = new RegExp("(?:" + wikiInlineRules.join("|") + ")", "g"); + var wikiRulesPattern = new RegExp("(?:(" + wikiRules.join(")|(") + "))", "g"); + var wikiDetectLinkPattern = new RegExp("(?:" + wikiDetectLinkRules.join("|") + ")", "g"); + + Wysiwyg.prototype._linkScheme = _linkScheme; + Wysiwyg.prototype._quotedString = _quotedString; + Wysiwyg.prototype._wikiPageName = _wikiPageName; + Wysiwyg.prototype.wikiInlineRules = wikiInlineRules; + Wysiwyg.prototype.wikiRules = wikiRules; + Wysiwyg.prototype.xmlNamePattern = new RegExp("^" + _xmlName + "$"); + Wysiwyg.prototype.domToWikiInlinePattern = domToWikiInlinePattern; + Wysiwyg.prototype.wikiRulesPattern = wikiRulesPattern; + Wysiwyg.prototype.wikiDetectLinkPattern = wikiDetectLinkPattern; +}()); + +Wysiwyg.prototype.normalizeLink = function (link) { + if (/^[\/.#]/.test(link)) { + link = encodeURIComponent(link); + } +// if (!/^[\w.+\-]+:/.test(link)) { +// link = link; +// } + if (/^[^\"\']/.test(link) && /\s/.test(link)) { + if (link.indexOf('"') === -1) { + link = '"' + link + '"'; + } else if (link.indexOf("'") === -1) { + link = "'" + link + "'"; + } else { + link = '"' + link.replace(/"/g, "%22") + '"'; + } + } + return link; +}; + +Wysiwyg.prototype.isInlineNode = function (node) { + if (node) { + switch (node.nodeType) { + case 1: + return this.wikiInlineTags.hasOwnProperty(node.tagName.toLowerCase()); + case 3: + return true; + } + } + return false; +}; + +(function () { + var blocks = { + p: true, + blockquote: true, + div: true, + li: true, + ul: true, + ol: true, + dl: true, + dt: true, + dd: true, + h1: true, + h2: true, + h3: true, + h4: true, + h5: true, + h6: true, + table: true, + thead: true, + tbody: true, + tr: true, + td: true, + th: true + }; + + function generator(prop, blocks) { + return function (node) { + if (!node) { + return false; + } + while (!node[prop]) { + node = node.parentNode; + if (!node) { + return true; + } + if (node.nodeType === 1 && blocks[node.tagName.toLowerCase()]) { + return true; + } + } + return false; + }; + } + + Wysiwyg.prototype.isLastChildInBlockNode = generator("nextSibling", blocks); + Wysiwyg.prototype.isFirstChildInBlockNode = generator("previousSibling", blocks); +}()); + +Wysiwyg.prototype.wikitextToFragment = function (wikitext, contentDocument) { + var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; + var _linkScheme = this._linkScheme; + var _quotedString = this._quotedString; + var wikiInlineRulesCount = this.wikiInlineRules.length; + var wikiRulesCount = this.wikiRules.length - wikiInlineRulesCount; + + var self = this; + var fragment = contentDocument.createDocumentFragment(); + var holder = fragment; + var lines = wikitext.split("\n"); + var codeText = null; + var currentHeader = null; + var listDepth = []; + var decorationStatus; + var decorationStack; + var indexLines; + var inCollapsibleBlock; + inCollapsibleBlock = false; + + function inParagraph() { return getSelfOrAncestor(holder, "p"); } + function inDefinition() { return $(holder).parents().andSelf().filter("p.meta, p.comment").get(0); } + function inTable() { return getSelfOrAncestor(holder, "table"); } + function inEscapedTable() { return $(holder).parents().andSelf().filter("table.escaped").get(0); } + function inTableRow() { return getSelfOrAncestor(holder, "tr"); } + function inAnchor() { return getSelfOrAncestor(holder, "a"); } + function inEscapedText() { return getSelfOrAncestor(holder, "tt"); } + function inCodeBlock() { return getSelfOrAncestor(holder, "pre"); } + + function handleCodeBlock(value) { + if (!inCodeBlock()) { + var element = contentDocument.createElement("pre"); + holder.appendChild(element); + holder = element; + } else { + holder.appendChild(contentDocument.createTextNode(value)); + } + } + + function closeCodeBlock(value) { + if (inCodeBlock()) { + var target = getSelfOrAncestor(holder, "pre"); + holder = target.parentNode; + } else { + holder.appendChild(contentDocument.createTextNode(value)); + } + } + + function handleHeader(line) { + var match = /^\s*!([1-6])[ \t\r\f\v]+/.exec(line); + if (!match) { + return null; + } + + closeToFragment(); + var tag = "h" + match[1]; + var element = contentDocument.createElement(tag); + holder.appendChild(element); + holder = element; + return tag; + } + + function closeHeader() { + if (currentHeader) { + var target = getSelfOrAncestor(holder, currentHeader); + holder = target.parentNode; + currentHeader = null; + } + } + + function handleDefinition(line) { + closeToFragment(); + openParagraph(); + holder.appendChild(contentDocument.createTextNode(line)); + self.updateElementClassName(holder); + } + + function handleCollapsibleBlock(value) { + inCollapsibleBlock++; + closeParagraph(); + var collapsible = self.createCollapsableSection(); + + holder.appendChild(collapsible); + holder = collapsible; + + var m = /^!\*+([<>])?\s+(.*)$/.exec(value); + if (m) { + if (m[2]) { + handleLine(m[2] || ""); + closeParagraph(); + } + switch (m[1]) { + case "<": // Hidden + $(collapsible).addClass("hidden"); + break; + case ">": // Collapsed + $(collapsible).addClass("collapsed"); + break; + } + } + openParagraph(); + } + + function closeCollapsibleBlock() { + if (inCollapsibleBlock) { + inCollapsibleBlock--; + closeToFragment("div"); + if (holder !== fragment) { + holder = holder.parentNode; + } + // Ensure the user can always edit below the block + openParagraph(); + } + } + + function handleOpenInlineCode(name) { + var d = contentDocument; + var tagName, element; + switch (name) { + case "bold": + tagName = "b"; + break; + case "italic": + tagName = "i"; + break; + case "strike": + tagName = "strike"; + break; + } + + if (holder === fragment) { + openParagraph(); + } + element = d.createElement(tagName); + holder.appendChild(element); + holder = element; + decorationStatus[name] = true; + decorationStack.push(name); + } + + function handleCloseInlineCode(name) { + var d = contentDocument; + var tagNames = []; + var index; + for (index = decorationStack.length - 1; index >= 0; index--) { + var tagName = holder.tagName; + holder = holder.parentNode; + if (decorationStack[index] === name) { + break; + } + tagNames.push(tagName); + } + decorationStack.splice(index, 1); + decorationStatus[name] = false; + while (tagNames.length > 0) { + var element = d.createElement(tagNames.pop()); + holder.appendChild(element); + holder = element; + } + } + + function handleInline(name) { + if (name === "bolditalic") { + if (decorationStatus.italic) { + handleInline("italic"); + handleInline("bold"); + } else { + handleInline("bold"); + handleInline("italic"); + } + return; + } + + if (decorationStatus[name]) { + handleCloseInlineCode(name); + return; + } + handleOpenInlineCode(name); + } + + function handleInlineCode(value, length) { + var d = contentDocument; + var element = d.createElement("tt"); + element.setAttribute("class", "inlinecode"); + value = value.slice(length, -length); + if (value.length > 0) { + element.appendChild(d.createTextNode(value)); + holder.appendChild(element); + } + } + + function createAnchor(link, label, autolink) { + var anchor = self.createAnchor(link, label); + if (autolink) { + anchor.setAttribute("data-wysiwyg-autolink", true); + } + holder.appendChild(anchor); + return anchor; + } + + function handleLinks(value) { + var match = handleLinks.pattern.exec(value); + + if (match) { + var link = match[2]; + + var anchor = createAnchor(link); + holder = anchor; + handleLine(match[1]); + holder = anchor.parentNode; + } else { + holder.appendChild(contentDocument.createTextNode(value)); + } + } + + handleLinks.pattern = new RegExp("\\[" + + "\\[(.*)\\]" + + "\\[(.*)\\]" + + "\\]"); + + function handleWikiLink(value) { + createAnchor(value, value); + } + + function handleWikiPageName(name, label) { + if (!inAnchor()) { + createAnchor(name, label || name, true); + } else { + holder.appendChild(contentDocument.createTextNode(label || name)); + } + } + + function handleList(value) { + var match = /^(\s*)([*1-9-])\s/.exec(value); + var className, depth, start; + if (!match) { + holder.appendChild(contentDocument.createTextNode(value)); + return; + } + + depth = match[1].length; + + var last = listDepth.length - 1; + if (depth > (last >= 0 ? listDepth[last] : -1)) { + closeToFragment("li"); + openList(/[1-9]/.test(match[2]) ? "ol" : "ul", className, start, depth); + } else { + var container, list, tmp; + if (listDepth.length > 1 && depth < listDepth[last]) { + do { + if (depth >= listDepth[last]) { + break; + } + closeList(); + last = listDepth.length - 1; + } while (listDepth.length > 1); + container = holder; + } else { + list = getSelfOrAncestor(holder, "li"); + self.appendBogusLineBreak(list); + container = list.parentNode; + } + tmp = contentDocument.createElement("li"); + container.appendChild(tmp); + holder = tmp; + listDepth[last] = depth; + } + } + + function openList(tag, className, start, depth) { + var d = contentDocument; + var h = holder; + var container = d.createElement(tag); + + if (className) { + container.className = className; + } + if (start) { + container.setAttribute("start", start); + } + var list = d.createElement("li"); + container.appendChild(list); + + var target; + if (h === fragment) { + target = fragment; + } else { + target = getSelfOrAncestor(h, "li"); + target = target ? target.parentNode : h; + } + target.appendChild(container); + holder = list; + listDepth.push(depth); + } + + function closeList() { + var h = holder; + var target = getSelfOrAncestor(h, "li"); + if (target) { + self.appendBogusLineBreak(target); + holder = target.parentNode.parentNode; + } else { + holder = h.parentNode; + } + listDepth.pop(); + } + + function openParagraph() { + if (!inParagraph()) { + var element = contentDocument.createElement("p"); + holder.appendChild(element); + holder = element; + } + } + + function closeParagraph() { + if (inParagraph()) { + var target = holder; + if (target !== fragment) { + target = getSelfOrAncestor(target, "p"); + self.appendBogusLineBreak(target); + self.updateElementClassName(target); + holder = target.parentNode; + } + } + } + + function openEscapedText(value) { + if (!inEscapedText()) { + var element = contentDocument.createElement("tt"); + element.setAttribute('class', { '!-': 'escape', '!<': 'htmlescape', '!{': 'hashtable', '!(': 'nested', '![': 'plaintexttable' }[value]); + holder.appendChild(element); + holder = element; + } else { + holder.appendChild(contentDocument.createTextNode(value)); + } + } + + function closeEscapedText(value) { + if (inEscapedText()) { + var target = holder; + target = getSelfOrAncestor(target, "tt"); + holder = target.parentNode; + } else { + holder.appendChild(contentDocument.createTextNode(value)); + } + } + + function handleTableCell(action, escaped, hidden) { + var d = contentDocument; + var h, table, tbody, cell; + + if (!inTable()) { + h = holder; + + // Just ensure you can type between to tables + if (h.lastChild && h.lastChild.tagName === 'TABLE') { + h.appendChild(d.createElement('p')); + } + table = d.createElement("table"); + if (escaped) { + table.className = "escaped"; + } + tbody = d.createElement("tbody"); + table.appendChild(tbody); + h.appendChild(table); + } else { + h = holder; + tbody = getSelfOrAncestor(h, "tbody"); + } + + if (inTableRow()) { + cell = getSelfOrAncestor(h, "td"); + if (cell) { + self.appendBogusLineBreak(cell); + } + } + + var row; + switch (action) { + case 1: + row = d.createElement("tr"); + tbody.appendChild(row); + if (hidden) { + row.className = "hidden"; + } + break; + case 0: + row = getSelfOrAncestor(h, "tr"); + break; + case -1: + if (inTableRow()) { + var target = getSelfOrAncestor(h, "tr"); + holder = target.parentNode; + } + return; + } + + cell = d.createElement("td"); + row.appendChild(cell); + holder = cell; + decorationStatus = {}; + } + + function closeTable() { + if (inTable()) { + var target = getSelfOrAncestor(holder, "table"); + + self.spanTableColumns(target); + holder = target.parentNode; + } + } + + function closeToFragment(stopTag) { + // Note: we're not exceeding collapsable section boundries + var element = holder; + var _fragment = fragment; + stopTag = stopTag ? stopTag.toLowerCase() : "div"; + + while (element !== _fragment) { + var tag = element.tagName.toLowerCase(); + var method = null; + switch (tag) { + case stopTag: + case "div": + holder = element; + return; + case "p": + method = closeParagraph; + break; + case "li": + case "ul": + case "ol": + method = closeList; + break; + case "td": + case "tr": + case "tbody": + case "table": + method = closeTable; + break; + case "pre": + method = closeCodeBlock; + break; + default: + break; + } + if (method) { + method(); + element = holder; + } else { + element = element.parentNode; + } + } + + holder = _fragment; + } + + function getMatchNumber(match) { + var length = match.length; + var i; + for (i = 1; i < length; i++) { + if (match[i]) { + if (i <= wikiRulesCount) { + return -i; + } + return i - wikiRulesCount; + } + } + return null; + } + + function handleLine(line) { + var wikiRulesPattern = new RegExp(self.wikiRulesPattern.source, "g"); + var prevIndex = wikiRulesPattern.lastIndex; + wikiRulesPattern.lastIndex = 0; + while (true) { + var match = wikiRulesPattern.exec(line); + var matchNumber = null; + var text = null; + + // Deal with unmatched text + if (match) { + matchNumber = getMatchNumber(match); + if (prevIndex < match.index) { + text = line.substring(prevIndex, match.index); + } + } else { + text = line.substring(prevIndex); + } + + if (((prevIndex === 0 && text) || (match && match.index === 0 && matchNumber > 0)) + && !inParagraph() && !inAnchor() && !inEscapedText() && !inCodeBlock() && !currentHeader) { + closeToFragment(); + } + + + if (text || (match && matchNumber > 0)) { + if (inParagraph() && (prevIndex === 0)) { + text = text ? ((holder.hasChildNodes() && holder.lastChild.tagName !== 'BR' ? " " : "") + text) : ""; + } + if ((listDepth.length === 0 && !inTable() && !currentHeader) || holder === fragment) { + openParagraph(); + } + if (text) { + holder.appendChild(contentDocument.createTextNode(text)); + } + } + + if (!match) { + break; + } + prevIndex = wikiRulesPattern.lastIndex; + var matchText = match[0]; + + switch (matchNumber) { + case 1: // bolditalic + if (inEscapedTable() || inEscapedText()) { break; } + handleInline("bolditalic"); + continue; + case 2: // bold + if (inEscapedTable() || inEscapedText()) { break; } + handleInline("bold"); + continue; + case 3: // italic + if (inEscapedTable() || inEscapedText()) { break; } + handleInline("italic"); + continue; + case 4: // strike + if (inEscapedTable() || inEscapedText()) { break; } + handleInline("strike"); + continue; + case 5: // open code block + if (inEscapedTable() || inEscapedText()) { break; } + handleCodeBlock(matchText); + continue; + case 6: // close code block + if (inEscapedTable() || inEscapedText()) { break; } + closeCodeBlock(matchText); + continue; + case 7: // open escaped + if (inEscapedText()) { break; } + openEscapedText(matchText); + continue; + case 8: // close escaped + closeEscapedText(matchText); + continue; + case 9: // Wiki link + if (inEscapedTable() || inEscapedText() || inCodeBlock()) { break; } + handleLinks(matchText); + continue; + case 10: // WikiPageName + if (inEscapedTable() || inEscapedText() || inCodeBlock()) { break; } + handleWikiPageName(matchText); + continue; + case -1: // header + currentHeader = handleHeader(matchText); + if (currentHeader) { + var m = /^\s*!([1-6])[ \t\r\f\v]+/.exec(line); + wikiRulesPattern.lastIndex = prevIndex = m[0].length; + continue; + } + break; + case -2: // list + if (inEscapedText() || inCodeBlock()) { break; } + handleList(matchText); + continue; + case -3: // definition (leading "!") and comments (leading "#") + if (inEscapedText() || inCodeBlock()) { break; } + handleDefinition(matchText); + continue; + case -4: // closing table row + if (inEscapedText() || inCodeBlock()) { break; } + if (inTable()) { + handleTableCell(-1); + continue; + } + break; + case -5: // cell + if (inDefinition()) { break; } + if (inEscapedText() || inCodeBlock()) { + if (/^-!/.test(matchText)) { + closeEscapedText(matchText); + matchText = matchText.substring(2); + if (inTable()) { + handleTableCell(-1); + continue; + } + } + break; + } + if (!inTable() && match.index === 0) { + closeToFragment(); + } + wikiRulesPattern.lastIndex = prevIndex; + handleTableCell(inTableRow() ? 0 : 1, /^-?!/.test(matchText), /^-/.test(matchText)); + continue; + case -6: // collapsible section + if (inEscapedText()) { break; } + handleCollapsibleBlock(matchText); + continue; + case -7: // close collapsible section + if (inEscapedText()) { break; } + closeCollapsibleBlock(); + continue; + } + + if (matchText) { + if (listDepth.length === 0 && !currentHeader && !inTable() && !inAnchor()) { + openParagraph(); + } + holder.appendChild(contentDocument.createTextNode(matchText)); + } + } + + if (inEscapedText() || inCodeBlock()) { + var element = contentDocument.createElement("br"); + holder.appendChild(element); + } else if (inParagraph()) { + self.updateElementClassName(holder); + if (inDefinition()) { + closeParagraph(); + } + } + } + + for (indexLines = 0; indexLines < lines.length; indexLines++) { + var line = lines[indexLines].replace(/\r$/, ""); + if (/^----/.test(line)) { + closeToFragment(); + fragment.appendChild(contentDocument.createElement("hr")); + continue; + } + if (line.length === 0 && !inCodeBlock()) { + closeToFragment(); + continue; + } + line = line.replace(/\t/g, " "); + line = line.replace(/\u00a0/g, " "); + + decorationStatus = {}; + decorationStack = []; + + handleLine(line); + + // Close headers here, since they should not interfere with other line types parsed. + if (currentHeader) { + closeHeader(); + } + if (inTable() && !inEscapedText()) { + handleTableCell(-1); + } + + } + closeToFragment(); + + return fragment; +}; + +Wysiwyg.prototype.wikitextToOnelinerFragment = function (wikitext, contentDocument) { + var source = this.wikitextToFragment(wikitext, contentDocument); + var fragment = contentDocument.createDocumentFragment(); + this.collectChildNodes(fragment, source.firstChild); + return fragment; +}; + +Wysiwyg.prototype.wikiOpenTokens = { + "h1": "!1 ", + "h2": "!2 ", + "h3": "!3 ", + "h4": "!4 ", + "h5": "!5 ", + "h6": "!6 ", + "b": "'''", + "strong": "'''", + "i": "''", + "em": "''", + "del": "--", + "strike": "--", + "hr": "----\n", + "table": true, + "tbody": true +}; + +Wysiwyg.prototype.wikiCloseTokens = { + "#text": true, + "a": true, + "tt": true, + "b": "'''", + "strong": "'''", + "i": "''", + "em": "''", + "del": "--", + "strike": "--", + "hr": true, + "tbody": true, + "tr": "|\n", + "td": true, + "th": true +}; + +Wysiwyg.prototype.wikiBlockTags = { + "h1": true, + "h2": true, + "h3": true, + "h4": true, + "h5": true, + "h6": true, + "table": true, + "hr": true +}; + +Wysiwyg.prototype.wikiInlineTags = { + "a": true, + "tt": true, + "b": true, + "strong": true, + "i": true, + "em": true, + "u": true, + "del": true, + "strike": true, + "sub": true, + "sup": true, + "br": true, + "span": true +}; + +Wysiwyg.prototype.domToWikitext = function (root, options) { + options = options || {}; + var retainNewLines = !!options.retainNewLines; + + var self = this; + var getTextContent = Wysiwyg.getTextContent; + var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; + var wikiOpenTokens = this.wikiOpenTokens; + var wikiCloseTokens = this.wikiCloseTokens; + var wikiInlineTags = this.wikiInlineTags; + var wikiBlockTags = this.wikiBlockTags; + var xmlNamePattern = this.xmlNamePattern; + var domToWikiInlinePattern = this.domToWikiInlinePattern; + var wikiPageNamePattern = new RegExp("^" + this._wikiPageName + "$"); + var decorationTokenPattern = /^(?:'''|'')$/; + + var texts = []; + var stack = []; + var last = root; + var listDepth = 0; + var quoteCitation = false; + var inCodeBlock = false; + var skipNode = null; + + function tokenFromSpan(node) { + var style = node.style; + if (style.fontWeight === "bold") { + return wikiOpenTokens.b; + } + if (style.fontStyle === "italic") { + return wikiOpenTokens.i; + } + switch (style.textDecoration) { + case "line-through": + return wikiOpenTokens.del; + } + return undefined; + } + + function nodeDecorations(node) { + var _wikiOpenTokens = wikiOpenTokens; + var _decorationTokenPattern = decorationTokenPattern; + var hash = {}; + + while (true) { + var childNodes = node.childNodes; + if (!childNodes || childNodes.length !== 1) { + break; + } + var child = childNodes[0]; + if (child.nodeType !== 1) { + break; + } + var token = _wikiOpenTokens[child.tagName.toLowerCase()]; + if (_decorationTokenPattern.test(token)) { + hash[token] = true; + } + node = child; + } + + return hash; + } + + function pushTextWithDecorations(text, node) { + var _texts = texts; + var _decorationTokenPattern = decorationTokenPattern; + var decorationsHash = nodeDecorations(node); + var decorations = []; + var cancelDecorations = []; + var token; + + while (_texts.length > 0) { + token = _texts[_texts.length - 1]; + if (_decorationTokenPattern.test(token)) { + if (decorationsHash[token]) { + delete decorationsHash[token]; + cancelDecorations.push(_texts.pop()); + continue; + } + if ((token === "'''" || token === "''") && _texts.length > 1) { + var moreToken = _texts[_texts.length - 2]; + if (_decorationTokenPattern.test(moreToken) + && token + moreToken === "'''''" + && decorationsHash[moreToken]) { + delete decorationsHash[moreToken]; + cancelDecorations.push(moreToken); + _texts[_texts.length - 2] = _texts[_texts.length - 1]; + _texts.pop(); + } + } + } + break; + } + + for (token in decorationsHash) { + decorations.push(token); + } + decorations.sort(); + + if (decorations.length > 0) { + _texts.push.apply(_texts, decorations); + } + _texts.push(text); + + if (decorations.length > 0) { + decorations.reverse(); + _texts.push.apply(_texts, decorations); + } + if (cancelDecorations.length > 0) { + cancelDecorations.reverse(); + _texts.push.apply(_texts, cancelDecorations); + } + } + + function pushToken(token) { + var _texts = texts; + var _decorationTokenPattern = decorationTokenPattern; + var length = _texts.length; + if (length === 0 || !_decorationTokenPattern.test(token)) { + _texts.push(token); + return; + } + var last = _texts[length - 1]; + if (!_decorationTokenPattern.test(last)) { + _texts.push(token); + return; + } + if (last === token) { + _texts.pop(); + return; + } + if (length < 2 || last + token !== "'''''") { + _texts.push(token); + return; + } + if (_texts[length - 2] === token) { + _texts[length - 2] = _texts[length - 1]; + _texts.pop(); + } else { + _texts.push(token); + } + } + + function linkText(link, label) { + if (link === label) { + return link; + } + if (!/\]/.test(label) && !/^[\"\']/.test(label)) { + return "[[" + label + "][" + link + "]]"; + } + return "[[" + label.replace(/"+/g, "") + "][" + link + "]]"; + } + + function pushAnchor(node, bracket) { + var _texts = texts; + var link = node.getAttribute("data-wysiwyg-link"); + var autolink = node.getAttribute("data-wysiwyg-autolink"); + + link = (link || node.href).replace(/^\s+|\s+$/g, ""); + var label = self.domToWikitext(node, options); + if (!label) { + return; + } + var text = null; + if (autolink === "true") { + if (wikiPageNamePattern.test(label)) { + text = label; + link = label; + } + } + if (text === null) { + text = linkText(link, label); + } + _texts.push(text); + } + + function string(source, times) { + var value = (1 << times) - 1; + return (value <= 0) ? "" : value.toString(2).replace(/1/g, source); + } + + function open(name, node) { + if (skipNode !== null) { + return; + } + var _texts = texts; + var token = wikiOpenTokens[name]; + if (token !== undefined) { + if (wikiBlockTags[name] && self.isInlineNode(node.previousSibling)) { + _texts.push("\n"); + } + if (token !== true) { + pushToken(token); + } + if (name === "table") { + if ($('tr', node).first().hasClass('hidden')) { + _texts.push("-"); + } + if ($(node).hasClass("escaped")) { + _texts.push("!"); + } + } + } else { + var value, text; + switch (name) { + case "#text": + value = node.nodeValue; + if (value) { + if (!(inCodeBlock || retainNewLines)) { + if (value && !self.isInlineNode(node.previousSibling || node.parentNode)) { + value = value.replace(/^[ \t\r\n\f\v]+/g, ""); + } + if (value && !self.isInlineNode(node.nextSibling || node.parentNode)) { + value = value.replace(/[ \t\r\n\f\v]+$/g, ""); + } + value = value.replace(/\r?\n/g, " "); + } + if (value) { + var length = _texts.length; + var prev = length > 0 ? _texts[length - 1] : null; + _texts.push(value); + } + } + break; + case "p": + if (!/[^ \t\r\n\f\v]/.test(getTextContent(node))) { + skipNode = node; + } + break; + case "a": + skipNode = node; + pushAnchor(node); + break; + case "li": + _texts.push(" " + string(" ", listDepth - 1)); + var container = node.parentNode; + if ((container.tagName || "").toLowerCase() === "ol") { + _texts.push("1 "); + } else { + _texts.push("* "); + } + break; + case "ul": + case "ol": + if (listDepth === 0) { + if (self.isInlineNode(node.previousSibling)) { + _texts.push("\n"); + } + } else if (listDepth > 0) { + if (node.parentNode.tagName.toLowerCase() === "li") { + _texts.push("\n"); + } + } + listDepth++; + break; + case "br": + if (inCodeBlock || retainNewLines) { + _texts.push("\n"); + } else if (!self.isBogusLineBreak(node)) { + _texts.push(" "); + } + break; + case "pre": + _texts.push("{{{"); + inCodeBlock = true; + break; + case "th": + case "td": + skipNode = node; + _texts.push("|"); + text = self.domToWikitext(node, self.options).replace(/^ +| +$/g, "").replace(/\n$/, ""); + if (text) { + _texts.push(" ", text, " "); + break; + } else { + _texts.push(" "); + } + break; + case "tr": + break; + case "tt": + skipNode = node; + value = node.innerHTML.replace(/
            /g, '\n').replace(/>/g, ">").replace(/</g, "<"); + if (value) { + var tags = { + 'escape': [ "!-", "-!" ], + 'htmlescape': [ "!<", ">!" ], + 'hashtable': [ "!{", "}!" ], + 'nested': [ "!(", ")!" ], + 'plaintexttable': [ "![", "]!" ], + 'inlinecode': [ "{{{", "}}}" ] + }[node.getAttribute('class') || "escape"]; + text = tags[0] + value + tags[1]; + pushTextWithDecorations(text, node); + } + break; + case "span": + if (node.className === "wikianchor" && xmlNamePattern.test(node.id || "")) { + skipNode = node; + text = self.domToWikitext(node, self.options).replace(/^ +| +$|\]/g, ""); + _texts.push("[=#", node.id, text ? " " + text + "]" : "]"); + } else { + token = tokenFromSpan(node); + if (token !== undefined) { + pushToken(token); + } + } + break; + case "div": + if ($(node).hasClass("collapsable")) { + _texts.push("!***"); + if ($(node).hasClass("collapsed")) { + _texts.push("> "); + } else if ($(node).hasClass("hidden")) { + _texts.push("< "); + } else { + _texts.push(" "); + } + } + break; + case "script": + case "style": + skipNode = node; + break; + } + } + } + + function close(name, node) { + if (skipNode !== null) { + if (skipNode === node) { + skipNode = null; + } + return; + } + var _texts = texts; + var token = wikiCloseTokens[name]; + if (token === true) { + // nothing to do + } else if (token !== undefined) { + pushToken(token); + } else { + switch (name) { + case "p": + if ($(node).hasClass('meta') || retainNewLines) { + _texts.push("\n"); + } else { + _texts.push("\n\n"); + } + break; + case "li": + if (node.getElementsByTagName("li").length === 0) { + _texts.push("\n"); + } + break; + case "ul": + case "ol": + listDepth--; + if (listDepth === 0) { + _texts.push("\n"); + } + break; + case "pre": + var text; + var parentNode = node.parentNode; + if (parentNode && /^(?:li|dd)$/i.test(parentNode.tagName)) { + var nextSibling = node.nextSibling; + if (!nextSibling) { + text = "\n}}}"; + } else if (nextSibling.nodeType !== 1) { + text = "\n}}}"; + } else if (nextSibling.tagName.toLowerCase() === "pre") { + text = "}}}"; + } else { + text = "\n}}}"; + } + if (text.slice(-1) === "\n") { + text += listDepth > 0 ? " " + string(" ", listDepth) : " "; + } + } else { + text = "}}}"; + } + _texts.push(text); + inCodeBlock = false; + break; + case "span": + token = tokenFromSpan(node); + if (token !== undefined) { + _texts.push(token); + } + break; + case "div": + if ($(node).hasClass("collapsable")) { + _texts.push("*!\n"); + } + break; + case "table": + _texts.push("\n"); + break; + } + } + if (/^h[1-6]$/.test(name)) { + if (xmlNamePattern.test(node.id || "")) { + _texts.push(" #", node.id); + } + _texts.push("\n"); + } + } + + function iterator(node) { + var name = null; + switch (node && node.nodeType) { + case 1: // element + name = node.tagName.toLowerCase(); + break; + case 3: // text + name = "#text"; + break; + } + + if (node && last === node.parentNode) { + // down + // nothing to do + } else if (node && last === node.previousSibling) { + // forward + close(stack.pop(), last); + } else { + // up, forward + var tmp = last; + var nodeParent = node ? node.parentNode : root; + while (true) { + var parent = tmp.parentNode; + if (parent === node) { + break; + } + close(stack.pop(), tmp); + if (parent === nodeParent || !parent) { + if (!node) { + return; + } + break; + } + tmp = parent; + } + } + open(name, node); + stack.push(name); + last = node; + } + + this.treeWalk(root, iterator); + return texts.join("").replace(/^(?: *\n)+/, "").replace(/(?: *\n)+$/, "\n"); +}; + +Wysiwyg.prototype.updateElementClassName = function (element) { + var getSelfOrAncestor = Wysiwyg.getSelfOrAncestor; + var p = getSelfOrAncestor(element, "p"); + if (p) { + if (/^![a-z]/.test(p.innerHTML)) { + if (p.className !== 'meta') { + p.className = 'meta'; + } + } else if (/^#/.test(p.innerHTML)) { + if (p.className !== 'comment') { + p.className = 'comment'; + } + } else { + $(p).removeClass(); + } + } +}; + +if (window.getSelection) { + Wysiwyg.prototype.appendBogusLineBreak = function (element) { + var wikiInlineTags = this.wikiInlineTags; + var last = element.lastChild; + var br = this.contentDocument.createElement("br"); + while (true) { + if (!last) { + break; + } + if (last.nodeType !== 1) { + return; + } + var name = last.tagName.toLowerCase(); + if (name === "br") { + break; + } + if (!wikiInlineTags[name]) { + return; + } + last = last.lastChild || last.previousSibling; + } + element.appendChild(br); + }; + Wysiwyg.prototype.isBogusLineBreak = Wysiwyg.prototype.isLastChildInBlockNode; + Wysiwyg.prototype.insertParagraphOnEnter = function (event) { + var range = this.getSelectionRange(); + var node = range.endContainer; + var header = null; + if (node && node.nodeType === 3 && range.endOffset === node.nodeValue.length) { + var nextSibling = node.nextSibling; + if (!nextSibling || nextSibling.tagName.toLowerCase() === "br") { + while (node) { + if (node.nodeType === 1 && /^h[1-6]$/i.exec(node.tagName)) { + header = node; + break; + } + node = node.parentNode; + } + if (header) { + var parent = header.parentNode; + var childNodes = parent.childNodes; + var length = childNodes.length; + var offset; + for (offset = 0; offset < length; offset++) { + if (childNodes[offset] === header) { + offset++; + break; + } + } + this.selectRange(parent, offset, parent, offset); + this.insertHTML('


            '); + Wysiwyg.stopEvent(event); + } + } + } + }; + Wysiwyg.prototype.tableHTML = function (id, row, col) { + var html = this._tableHTML(row, col); + return html.replace(/<\/td>/g, '
            ').replace(//, ''); + }; + Wysiwyg.prototype.insertTableCell = function (row, index) { + var cell = row.insertCell(index); + this.appendBogusLineBreak(cell); + return cell; + }; + Wysiwyg.prototype.getFocusNode = function () { + return this.contentWindow.getSelection().focusNode; + }; + if (window.opera) { + Wysiwyg.prototype.insertLineBreak = function () { + this.execCommand("inserthtml", "
            "); + }; + Wysiwyg.prototype.insertLineBreakOnShiftEnter = null; + } else if (window.getSelection().setBaseAndExtent) { // Safari 2+ + Wysiwyg.prototype.insertLineBreak = function () { + this.execCommand("insertlinebreak"); + }; + Wysiwyg.prototype.insertLineBreakOnShiftEnter = function (event) { + this.insertLineBreak(); + Wysiwyg.stopEvent(event); + }; + } else { // Firefox 2+ + Wysiwyg.prototype.insertLineBreak = function () { + var d = this.contentDocument; + var event = d.createEvent("KeyboardEvent"); + event.initKeyEvent("keypress", true, true, null, false, false, true, false, 0x000d, 0); + d.body.dispatchEvent(event); + }; + Wysiwyg.prototype.insertLineBreakOnShiftEnter = null; + } + if (window.getSelection().removeAllRanges) { + Wysiwyg.prototype.selectNode = function (node) { + var selection = this.contentWindow.getSelection(); + selection.removeAllRanges(); + var range = this.contentDocument.createRange(); + range.selectNode(node); + selection.addRange(range); + }; + Wysiwyg.prototype.selectNodeContents = function (node) { + var selection = this.contentWindow.getSelection(); + selection.removeAllRanges(); + var range = this.contentDocument.createRange(); + range.selectNodeContents(node); + selection.addRange(range); + }; + Wysiwyg.prototype.selectRange = function (start, startOffset, end, endOffset) { + var selection = this.contentWindow.getSelection(); + selection.removeAllRanges(); + var range = this.contentDocument.createRange(); + range.setStart(start, startOffset); + range.setEnd(end, endOffset); + selection.addRange(range); + }; + Wysiwyg.prototype.getNativeSelectionRange = function () { + var selection = this.contentWindow.getSelection(); + return selection.rangeCount > 0 ? selection.getRangeAt(0) : null; + }; + Wysiwyg.prototype.expandSelectionToElement = function (arg) { + if (arg.start || arg.end) { + var selection = this.contentWindow.getSelection(); + var range = this.getNativeSelectionRange() || this.contentDocument.createRange(); + selection.removeAllRanges(); + if (arg.start) { + range.setStartBefore(arg.start); + } + if (arg.end) { + range.setEndAfter(arg.end); + } + selection.addRange(range); + } + }; + Wysiwyg.prototype.insertHTML = function (html) { + this.execCommand("inserthtml", html); + }; + } else { // Safari 2 + Wysiwyg.prototype.selectNode = function (node) { + var selection = this.contentWindow.getSelection(); + var range = this.contentDocument.createRange(); + range.selectNode(node); + selection.setBaseAndExtent(range.startContainer, range.startOffset, range.endContainer, range.endOffset); + range.detach(); + }; + Wysiwyg.prototype.selectNodeContents = function (node) { + this.selectRange(node, 0, node, node.childNodes.length); + }; + Wysiwyg.prototype.selectRange = function (start, startOffset, end, endOffset) { + var selection = this.contentWindow.getSelection(); + selection.setBaseAndExtent(start, startOffset, end, endOffset); + }; + Wysiwyg.prototype.getNativeSelectionRange = function () { + var selection = this.contentWindow.getSelection(); + if (selection.anchorNode) { + var range = this.contentDocument.createRange(); + range.setStart(selection.baseNode, selection.baseOffset); + range.setEnd(selection.extentNode, selection.extentOffset); + if (range.collapsed && !selection.isCollapsed) { + range.setStart(selection.extentNode, selection.extentOffset); + range.setEnd(selection.baseNode, selection.baseOffset); + } + return range; + } + return null; + }; + Wysiwyg.prototype.expandSelectionToElement = function (arg) { + if (arg.start || arg.end) { + var selection = this.contentWindow.getSelection(); + var range = this.getNativeSelectionRange(); + if (arg.start) { + range.setStartBefore(arg.start); + } + if (arg.end) { + range.setEndAfter(arg.end); + } + selection.setBaseAndExtent(range.startContainer, range.startOffset, range.endContainer, range.endOffset); + range.detach(); + } + }; + Wysiwyg.prototype.insertHTML = function (html) { + var range = this.getNativeSelectionRange(); + if (range) { + var d = this.contentDocument; + var tmp = d.createRange(); + tmp.setStart(d.body, 0); + tmp.setEnd(d.body, 0); + var fragment = tmp.createContextualFragment(html); + range.deleteContents(); + range.insertNode(fragment); + range.detach(); + tmp.detach(); + } + }; + } + Wysiwyg.prototype.getSelectionRange = Wysiwyg.prototype.getNativeSelectionRange; + Wysiwyg.prototype.getSelectionText = function () { + var range = this.getNativeSelectionRange(); + return range ? range.toString() : null; + }; + Wysiwyg.prototype.getSelectionHTML = function () { + var fragment = this.getSelectionFragment(); + var anonymous = this.contentDocument.createElement("div"); + anonymous.appendChild(fragment); + return anonymous.innerHTML; + }; + Wysiwyg.prototype.getSelectionFragment = function () { + var range = this.getNativeSelectionRange(); + return range ? range.cloneContents() : this.contentDocument.createDocumentFragment(); + }; + Wysiwyg.prototype.getSelectionPosition = function () { + var range = this.getNativeSelectionRange(); + var position = { start: null, end: null }; + if (range) { + position.start = range.startContainer; + position.end = range.endContainer; + } + return position; + }; + Wysiwyg.prototype.selectionContainsTagName = function (name) { + var selection = this.contentWindow.getSelection(); + var range = this.getNativeSelectionRange(); + if (!range) { + return false; + } + var ancestor = range.commonAncestorContainer; + if (!ancestor) { + return false; + } + if (Wysiwyg.getSelfOrAncestor(ancestor, name)) { + return true; + } + if (ancestor.nodeType !== 1) { + return false; + } + var elements = ancestor.getElementsByTagName(name); + var length = elements.length; + var i; + for (i = 0; i < length; i++) { + if (selection.containsNode(elements[i], true)) { + return true; + } + } + return false; + }; + +} else if (document.selection) { + Wysiwyg.prototype.appendBogusLineBreak = function (element) { }; + Wysiwyg.prototype.isBogusLineBreak = function (node) { return false; }; + Wysiwyg.prototype.insertParagraphOnEnter = null; + Wysiwyg.prototype.insertLineBreak = function () { + this.insertHTML("
            "); + }; + Wysiwyg.prototype.insertLineBreakOnShiftEnter = null; + Wysiwyg.prototype.tableHTML = function (id, row, col) { + var html = this._tableHTML(row, col); + return html.replace(//, ''); + }; + Wysiwyg.prototype.insertTableCell = function (row, index) { + return row.insertCell(index); + }; + Wysiwyg.prototype.getFocusNode = function () { + this.contentWindow.focus(); + var d = this.contentDocument; + var range = d.selection.createRange(); + var node = range.item ? range.item(0) : range.parentElement(); + return node.ownerDocument === d ? node : null; + }; + Wysiwyg.prototype.selectNode = function (node) { + var d = this.contentDocument; + var body = d.body; + var range; + d.selection.empty(); + try { + range = body.createControlRange(); + range.addElement(node); + } catch (e) { + range = body.createTextRange(); + range.moveToElementText(node); + } + range.select(); + }; + Wysiwyg.prototype.selectNodeContents = function (node) { + var d = this.contentDocument; + d.selection.empty(); + var range = d.body.createTextRange(); + range.moveToElementText(node); + range.select(); + }; + Wysiwyg.prototype.selectRange = function (start, startOffset, end, endOffset) { + var d = this.contentDocument; + var body = d.body; + d.selection.empty(); + var range = endPoint(start, startOffset); + if (start !== end || startOffset !== endOffset) { + range.setEndPoint("EndToEnd", endPoint(end, endOffset)); + } + range.select(); + + function endPoint(node, offset) { + var range; + if (node.nodeType === 1) { + var childNodes = node.childNodes; + if (offset >= childNodes.length) { + range = body.createTextRange(); + range.moveToElementText(node); + range.collapse(false); + return range; + } + node = childNodes[offset]; + if (node.nodeType === 1) { + range = body.createTextRange(); + range.moveToElementText(node); + range.collapse(true); + switch (node.tagName.toLowerCase()) { + case "table": + range.move("character", -1); + break; + } + return range; + } + return endPoint(node, 0); + } + if (node.nodeType !== 3) { + throw "selectRange: nodeType != @".replace(/@/, node.nodeType); + } + + range = body.createTextRange(); + var element = node.previousSibling; + while (element) { + var nodeType = element.nodeType; + if (nodeType === 1) { + range.moveToElementText(element); + range.collapse(false); + break; + } + if (nodeType === 3) { + offset += element.nodeValue.length; + } + element = element.previousSibling; + } + if (!element) { + range.moveToElementText(node.parentNode); + range.collapse(true); + } + if (offset !== 0) { + range.move("character", offset); + } + return range; + } + }; + Wysiwyg.prototype.getSelectionRange = function () { + var body = this.contentDocument.body; + var pseudo = {}; + var start = this.getNativeSelectionRange(); + if (start.item) { + var element = start.item(0); + var parent = element.parentNode; + var childNodes = parent.childNodes; + var length = childNodes.length; + var i; + + for (i = 0; i < length; i++) { + if (childNodes[i] === element) { + pseudo.startOffset = i; + pseudo.endOffset = i + 1; + break; + } + } + pseudo.collapsed = false; + pseudo.startContainer = pseudo.endContainer = parent; + return pseudo; + } + var end = start.duplicate(); + pseudo.collapsed = start.compareEndPoints("StartToEnd", end) === 0; + start.collapse(true); + end.collapse(false); + + function nextElement(range) { + var parent = range.parentElement(); + var childNodes = parent.childNodes; + var length = childNodes.length; + var i; + for (i = 0; i < length; i++) { + var node = childNodes[i]; + if (node.nodeType === 1) { + var tmp = body.createTextRange(); + tmp.moveToElementText(node); + if (range.compareEndPoints("EndToStart", tmp) <= 0) { + return node; + } + } + } + return null; + } + + function nodeOffset(range, parent, element, index, length) { + var tmp = body.createTextRange(); + var len; + tmp.moveToElementText(element || parent); + tmp.collapse(!!element); + tmp.move("character", -index); + if (!element) { + length++; + } + for (len = length; len >= 0; len--) { + if (tmp.compareEndPoints("EndToStart", range) === 0) { + return len; + } + tmp.move("character", -1); + } + return null; + } + + function setContainerOffset(range, containerKey, offsetKey) { + var parent = range.parentElement(); + var element = nextElement(range); + var index = 0; + var node = element ? element.previousSibling : parent.lastChild; + var offset, length; + while (node && node.nodeType === 3) { + length = node.nodeValue.length; + offset = nodeOffset(range, parent, element, index, length); + if (offset !== null) { + pseudo[containerKey] = node; + pseudo[offsetKey] = offset; + return; + } + index += length; + node = node.previousSibling; + } + var childNodes = parent.childNodes; + length = childNodes.length; + if (length > 0) { + pseudo[containerKey] = parent; + pseudo[offsetKey] = containerKey === "startContainer" ? 0 : length - 1; + return; + } + element = parent; + parent = element.parentNode; + childNodes = parent.childNodes; + length = childNodes.length; + for (offset = 0; offset < length; offset++) { + if (element === childNodes[offset]) { + pseudo[containerKey] = parent; + pseudo[offsetKey] = offset; + return; + } + } + } + + setContainerOffset(start, "startContainer", "startOffset"); + setContainerOffset(end, "endContainer", "endOffset"); + return pseudo; + }; + Wysiwyg.prototype.getNativeSelectionRange = function () { + this.contentWindow.focus(); + return this.contentDocument.selection.createRange(); + }; + Wysiwyg.prototype.getSelectionText = function () { + var range = this.getNativeSelectionRange(); + if (range) { + return range.item ? range.item(0).innerText : range.text; + } + return null; + }; + Wysiwyg.prototype.getSelectionHTML = function () { + var range = this.getNativeSelectionRange(); + if (range) { + return range.item ? range.item(0).innerHTML : range.htmlText; + } + return null; + }; + Wysiwyg.prototype.getSelectionFragment = function () { + var d = this.contentDocument; + var fragment = d.createDocumentFragment(); + var anonymous = d.createElement("div"); + anonymous.innerHTML = this.getSelectionHTML(); + this.collectChildNodes(fragment, anonymous); + return fragment; + }; + Wysiwyg.prototype.getSelectionPosition = function () { + this.contentWindow.focus(); + var d = this.contentDocument; + var range = d.selection.createRange(); + var startNode = null; + var endNode = null; + if (range.item) { + if (range.item(0).ownerDocument === d) { + startNode = range.item(0); + endNode = range.item(range.length - 1); + } + } else { + if (range.parentElement().ownerDocument === d) { + var startRange = range.duplicate(); + startRange.collapse(true); + startNode = startRange.parentElement(); + var endRange = range.duplicate(); + endRange.collapse(false); + endNode = endRange.parentElement(); + } + } + return { start: startNode, end: endNode }; + }; + Wysiwyg.prototype.expandSelectionToElement = function (arg) { + this.contentWindow.focus(); + var d = this.contentDocument; + var body = d.body; + var range = d.selection.createRange(); + var tmp; + if (arg.start) { + tmp = body.createTextRange(); + tmp.moveToElementText(arg.start); + range.setEndPoint("StartToStart", tmp); + } + if (arg.end) { + tmp = body.createTextRange(); + tmp.moveToElementText(arg.end); + range.setEndPoint("EndToEnd", tmp); + } + if (tmp) { + range.select(); + } + }; + Wysiwyg.prototype.selectionContainsTagName = function (name) { + this.contentWindow.focus(); + var d = this.contentDocument; + var selection = d.selection; + var range = selection.createRange(); + var parent = range.item ? range.item(0) : range.parentElement(); + if (!parent) { + return false; + } + if (Wysiwyg.getSelfOrAncestor(parent, name)) { + return true; + } + var elements = parent.getElementsByTagName(name); + var length = elements.length; + var i; + for (i = 0; i < length; i++) { + var testRange = selection.createRange(); + testRange.moveToElementText(elements[i]); + if (range.compareEndPoints("StartToEnd", testRange) <= 0 + && range.compareEndPoints("EndToStart", testRange) >= 0) { + return true; + } + } + return false; + }; + Wysiwyg.prototype.insertHTML = function (html) { + this.contentWindow.focus(); + var selection = this.contentDocument.selection; + var range = selection.createRange(); + range.pasteHTML(html.replace(/\t/g, " ")); + range.collapse(false); + range.select(); + range = this.contentDocument.selection.createRange(); + }; + +} else { + Wysiwyg.prototype.appendBogusLineBreak = function (element) { }; + Wysiwyg.prototype.insertParagraphOnEnter = null; + Wysiwyg.prototype.insertLineBreak = function () { }; + Wysiwyg.prototype.insertTableCell = function (row, index) { return null; }; + Wysiwyg.prototype.getFocusNode = function () { return null; }; + Wysiwyg.prototype.selectNode = function (node) { }; + Wysiwyg.prototype.selectNodeContents = function (node) { return null; }; + Wysiwyg.prototype.selectRange = function (start, startOffset, end, endOffset) { }; + Wysiwyg.prototype.getSelectionRange = function () { return null; }; + Wysiwyg.prototype.getNativeSelectionRange = function () { return null; }; + Wysiwyg.prototype.getSelectionText = function () { return null; }; + Wysiwyg.prototype.getSelectionHTML = function () { return null; }; + Wysiwyg.prototype.getSelectionFragment = function () { return null; }; + Wysiwyg.prototype.getSelectionPosition = function () { return null; }; + Wysiwyg.prototype.expandSelectionToElement = function (arg) { }; + Wysiwyg.prototype.selectionContainsTagName = function (name) { return false; }; + Wysiwyg.prototype.insertHTML = function (html) { }; +} + +Wysiwyg.prototype._treeWalkEmulation = function (root, iterator) { + if (!root.firstChild) { + iterator(null); + return; + } + var element = root; + while (element) { + if (element.firstChild) { + element = element.firstChild; + } else if (element.nextSibling) { + element = element.nextSibling; + } else { + while (true) { + element = element.parentNode; + if (element === root || !element) { + iterator(null); + return; + } + if (element.nextSibling) { + element = element.nextSibling; + break; + } + } + } + iterator(element); + } +}; + +if (document.createTreeWalker) { + Wysiwyg.prototype.treeWalk = function (root, iterator) { + var walker = root.ownerDocument.createTreeWalker( + root, + NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT, + null, + true + ); + while (walker.nextNode()) { + iterator(walker.currentNode); + } + iterator(null); + }; +} else { + Wysiwyg.prototype.treeWalk = Wysiwyg.prototype._treeWalkEmulation; +} + +Wysiwyg.instances = []; +Wysiwyg.count = 0; +Wysiwyg.paths = null; + +Wysiwyg.newInstance = function (textarea, options) { + var instance = new Wysiwyg(textarea, options); + Wysiwyg.instances.push(instance); + return instance; +}; + +Wysiwyg.findInstance = function (textarea) { + var instances = Wysiwyg.instances; + var length = instances.length; + var i; + for (i = 0; i < length; i++) { + var instance = instances[i]; + if (instance.textarea === textarea) { + return instance; + } + } + return null; +}; + +Wysiwyg.getStylePaths = function () { + var stylesheets = []; + var paths = { stylesheets: stylesheets, base: '/' }; + + var d = document; + var head = d.getElementsByTagName("head")[0]; + var links = head.getElementsByTagName("link"); + var length = links.length; + var i; + for (i = 0; i < length; i++) { + var link = links[i]; + var href = link.getAttribute("href") || ""; + var type = link.getAttribute("type") || ""; + switch ((link.getAttribute("rel") || "").toLowerCase()) { + case "wysiwyg.base": + paths.base = href; + break; + case "wysiwyg.stylesheet": + stylesheets.push(href); + break; + } + } + if (paths.base && stylesheets.length > 0) { + return paths; + } + return null; +}; + +Wysiwyg.getOptions = function () { + var options = {}; + if (window._wysiwyg) { + options = _wysiwyg; + } + return options; +}; + +Wysiwyg.getEditorMode = function () { + if (Wysiwyg.editorMode) { + return Wysiwyg.editorMode; + } + + var mode = null; + var cookies = (document.cookie || "").split(";"); + var length = cookies.length; + var i; + for (i = 0; i < length; i++) { + var match = /^\s*wysiwyg=(\S*)/.exec(cookies[i]); + if (match) { + switch (match[1]) { + case "wysiwyg": + mode = match[1]; + break; + default: // "textarea" + mode = null; + break; + } + break; + } + } + + Wysiwyg.editorMode = mode || "textarea"; + return Wysiwyg.editorMode; +}; + +Wysiwyg.setCookie = function (key, val) { + var expires, pieces; + var now = new Date(); + if (!/\/$/.test(Wysiwyg.paths.base)) { + expires = new Date(now.getTime() - 86400000); + pieces = [ key +"=", + "path=" + Wysiwyg.paths.base + "/", + "expires=" + expires.toUTCString() ]; + document.cookie = pieces.join("; "); + } + expires = new Date(now.getTime() + 365 * 86400 * 1000); + pieces = [ key + "=" + val, + "path=" + Wysiwyg.paths.base, + "expires=" + expires.toUTCString() ]; + document.cookie = pieces.join("; "); +}; + +Wysiwyg.removeEvent = function (element, type, func) { + jQuery(element).unbind(type, func); +}; + +Wysiwyg.stopEvent = function (event) { + if (event.preventDefault) { + event.preventDefault(); + event.stopPropagation(); + } else { + event.returnValue = false; + event.cancelBubble = true; + } +}; + +Wysiwyg.setStyle = function (element, object) { + var style = element.style; + var name; + for (name in object) { + style[name] = object[name]; + } +}; + +if (document.defaultView) { + Wysiwyg.getStyle = function (element, name) { + var value = element.style[name]; + if (!value) { + var style = element.ownerDocument.defaultView.getComputedStyle(element, null); + value = style ? style[name] : null; + } + return value; + }; +} else { + Wysiwyg.getStyle = function (element, name) { + return element.style[name] || element.currentStyle[name]; + }; +} + +Wysiwyg.getSelfOrAncestor = function (element, name) { + var target = element; + var d = element.ownerDocument; + if (name instanceof RegExp) { + while (target && target !== d) { + switch (target.nodeType) { + case 1: // element + if (name.test(target.tagName.toLowerCase())) { + return target; + } + break; + case 11: // fragment + return null; + } + target = target.parentNode; + } + } else { + name = name.toLowerCase(); + while (target && target !== d) { + switch (target.nodeType) { + case 1: // element + if (target.tagName.toLowerCase() === name) { + return target; + } + break; + case 11: // fragment + return null; + } + target = target.parentNode; + } + } + return null; +}; + +Wysiwyg.getTextContent = (function () { + var anonymous = document.createElement("div"); + if (typeof anonymous.textContent !== undefined) { + return function (element) { return element.textContent; }; + } else if (typeof anonymous.innerText !== undefined) { + return function (element) { return element.innerText; }; + } else { + return function (element) { return null; }; + } +})(); + +Wysiwyg.initialize = function () { + if ("replace".replace(/[a-e]/g, function (m) { return "*"; }) !== "r*pl***") { + return; + } + if (typeof document.designMode === undefined) { + return; + } + Wysiwyg.paths = Wysiwyg.getStylePaths(); + if (!Wysiwyg.paths) { + return; + } + var options = Wysiwyg.getOptions(); + var textareas = document.getElementsByTagName("textarea"); + var editors = []; + var i; + for (i = 0; i < textareas.length; i++) { + var textarea = textareas[i]; + if (/\bwikitext\b/.test(textarea.className || "")) { + editors.push(Wysiwyg.newInstance(textarea, options)); + } + } + return editors; +}; + +// vim:et:ai:ts=4 diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/BasicResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/BasicResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/BasicResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/BasicResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/BasicWikiPageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/BasicWikiPageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/BasicWikiPageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/BasicWikiPageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ChunkingResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/ChunkingResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ChunkingResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ChunkingResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ChunkingResponderTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/ChunkingResponderTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ChunkingResponderTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ChunkingResponderTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ChunkingResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/ChunkingResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ChunkingResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ChunkingResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/DefaultResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/DefaultResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/DefaultResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/DefaultResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ErrorResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/ErrorResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ErrorResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ErrorResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ErrorResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/ErrorResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ErrorResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ErrorResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ImportAndViewResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/ImportAndViewResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ImportAndViewResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ImportAndViewResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ImportAndViewResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/ImportAndViewResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ImportAndViewResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ImportAndViewResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/MockWikiImporter.class b/src/test/resources/fitnesse-target/fitnesse/responders/MockWikiImporter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/MockWikiImporter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/MockWikiImporter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/MockWikiImporterFactory.class b/src/test/resources/fitnesse-target/fitnesse/responders/MockWikiImporterFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/MockWikiImporterFactory.class rename to src/test/resources/fitnesse-target/fitnesse/responders/MockWikiImporterFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/NameWikiPageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/NameWikiPageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/NameWikiPageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/NameWikiPageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/NameWikiPageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/NameWikiPageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/NameWikiPageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/NameWikiPageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/NotFoundResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/NotFoundResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/NotFoundResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/NotFoundResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/NotFoundResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/NotFoundResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/NotFoundResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/NotFoundResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/PacketResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/PacketResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/PacketResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/PacketResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/PacketResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/PacketResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/PacketResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/PacketResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/PageDataWikiPageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/PageDataWikiPageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/PageDataWikiPageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/PageDataWikiPageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/PageDataWikiPageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/PageDataWikiPageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/PageDataWikiPageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/PageDataWikiPageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/PageFactory.class b/src/test/resources/fitnesse-target/fitnesse/responders/PageFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/PageFactory.class rename to src/test/resources/fitnesse-target/fitnesse/responders/PageFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/RawContentResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/RawContentResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/RawContentResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/RawContentResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/RawContentResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/RawContentResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/RawContentResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/RawContentResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ResponderFactory.class b/src/test/resources/fitnesse-target/fitnesse/responders/ResponderFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ResponderFactory.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ResponderFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ResponderFactoryTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/ResponderFactoryTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ResponderFactoryTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ResponderFactoryTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ResponderTestCase.class b/src/test/resources/fitnesse-target/fitnesse/responders/ResponderTestCase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ResponderTestCase.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ResponderTestCase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder$LinkPrefixBuilder.class b/src/test/resources/fitnesse-target/fitnesse/responders/RssResponder$LinkPrefixBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder$LinkPrefixBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/RssResponder$LinkPrefixBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder$RecentChangesPage.class b/src/test/resources/fitnesse-target/fitnesse/responders/RssResponder$RecentChangesPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder$RecentChangesPage.class rename to src/test/resources/fitnesse-target/fitnesse/responders/RssResponder$RecentChangesPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder$RecentChangesPageEntry.class b/src/test/resources/fitnesse-target/fitnesse/responders/RssResponder$RecentChangesPageEntry.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder$RecentChangesPageEntry.class rename to src/test/resources/fitnesse-target/fitnesse/responders/RssResponder$RecentChangesPageEntry.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder$RssFeed.class b/src/test/resources/fitnesse-target/fitnesse/responders/RssResponder$RssFeed.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder$RssFeed.class rename to src/test/resources/fitnesse-target/fitnesse/responders/RssResponder$RssFeed.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/RssResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/RssResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/RssResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/RssResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/RssResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/SerializedPageResponder$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/SerializedPageResponder$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/SerializedPageResponder$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/SerializedPageResponder$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/SerializedPageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/SerializedPageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/SerializedPageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/SerializedPageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/SerializedPageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/SerializedPageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/SerializedPageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/SerializedPageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ShutdownResponder$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/ShutdownResponder$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ShutdownResponder$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ShutdownResponder$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ShutdownResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/ShutdownResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ShutdownResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ShutdownResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ShutdownResponderTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/ShutdownResponderTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ShutdownResponderTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ShutdownResponderTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/ShutdownResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/ShutdownResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/ShutdownResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/ShutdownResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListener$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListener$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListener$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListener$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListener$SuiteEventProcessor.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListener$SuiteEventProcessor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListener$SuiteEventProcessor.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListener$SuiteEventProcessor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListener$TestEventProcessor.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListener$TestEventProcessor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListener$TestEventProcessor.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListener$TestEventProcessor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListener.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListener.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListenerTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListenerTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListenerTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListenerTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListenerTest$MockSuiteResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListenerTest$MockSuiteResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListenerTest$MockSuiteResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListenerTest$MockSuiteResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListenerTest$MockTestResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListenerTest$MockTestResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListenerTest$MockTestResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListenerTest$MockTestResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListenerTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListenerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportTestEventListenerTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportTestEventListenerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter$AuthenticationRequiredException.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter$AuthenticationRequiredException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter$AuthenticationRequiredException.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter$AuthenticationRequiredException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter$NullWikiImporterClient.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter$NullWikiImporterClient.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter$NullWikiImporterClient.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter$NullWikiImporterClient.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter$WikiImporterException.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter$WikiImporterException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter$WikiImporterException.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter$WikiImporterException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImporter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporterClient.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImporterClient.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporterClient.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImporterClient.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporterFactory.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImporterFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporterFactory.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImporterFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImporterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImporterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImporterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportingResponder$ImportError.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportingResponder$ImportError.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportingResponder$ImportError.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportingResponder$ImportError.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportingResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportingResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportingResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportingResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportingResponderAuthenticationTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportingResponderAuthenticationTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportingResponderAuthenticationTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportingResponderAuthenticationTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportingResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiImportingResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiImportingResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiImportingResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiPageResponder$WikiPageFooterRenderer.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiPageResponder$WikiPageFooterRenderer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiPageResponder$WikiPageFooterRenderer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiPageResponder$WikiPageFooterRenderer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiPageResponder$WikiPageRenderer.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiPageResponder$WikiPageRenderer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiPageResponder$WikiPageRenderer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiPageResponder$WikiPageRenderer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiPageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiPageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiPageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiPageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiPageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/WikiPageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/WikiPageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/WikiPageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/AddChildPageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/AddChildPageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/AddChildPageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/AddChildPageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/AddChildPageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/AddChildPageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/AddChildPageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/AddChildPageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/ContentFilter.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/ContentFilter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/ContentFilter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/ContentFilter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/EditResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/EditResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/EditResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/EditResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/EditResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/EditResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/EditResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/EditResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/MergeResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/MergeResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/MergeResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/MergeResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/MergeResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/MergeResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/MergeResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/MergeResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/NewPageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/NewPageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/NewPageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/NewPageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/NewPageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/NewPageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/NewPageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/NewPageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/PropertiesResponder$Symlink.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/PropertiesResponder$Symlink.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/PropertiesResponder$Symlink.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/PropertiesResponder$Symlink.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/PropertiesResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/PropertiesResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/PropertiesResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/PropertiesResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/PropertiesResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/PropertiesResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/PropertiesResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/PropertiesResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SavePropertiesResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/SavePropertiesResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SavePropertiesResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/SavePropertiesResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SavePropertiesResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/SavePropertiesResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SavePropertiesResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/SavePropertiesResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SaveResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/SaveResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SaveResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/SaveResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SaveResponderTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/SaveResponderTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SaveResponderTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/SaveResponderTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SaveResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/SaveResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SaveResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/SaveResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SymbolicLinkResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/SymbolicLinkResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SymbolicLinkResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/SymbolicLinkResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SymbolicLinkResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/editing/SymbolicLinkResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/editing/SymbolicLinkResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/editing/SymbolicLinkResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/CreateDirectoryResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/CreateDirectoryResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/CreateDirectoryResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/CreateDirectoryResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/CreateDirectoryResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/CreateDirectoryResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/CreateDirectoryResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/CreateDirectoryResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DeleteConfirmationResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/DeleteConfirmationResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DeleteConfirmationResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/DeleteConfirmationResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DeleteConfirmationResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/DeleteConfirmationResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DeleteConfirmationResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/DeleteConfirmationResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DeleteFileResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/DeleteFileResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DeleteFileResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/DeleteFileResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DeleteFileResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/DeleteFileResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DeleteFileResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/DeleteFileResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DirectoryResponder$FileInfo.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/DirectoryResponder$FileInfo.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DirectoryResponder$FileInfo.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/DirectoryResponder$FileInfo.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DirectoryResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/DirectoryResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DirectoryResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/DirectoryResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DirectoryResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/DirectoryResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/DirectoryResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/DirectoryResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/FileResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/FileResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/FileResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/FileResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/FileResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/FileResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/FileResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/FileResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/RenameFileConfirmationResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/RenameFileConfirmationResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/RenameFileConfirmationResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/RenameFileConfirmationResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/RenameFileConfirmationResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/RenameFileConfirmationResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/RenameFileConfirmationResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/RenameFileConfirmationResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/RenameFileResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/RenameFileResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/RenameFileResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/RenameFileResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/RenameFileResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/RenameFileResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/RenameFileResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/RenameFileResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/UploadResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/UploadResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/UploadResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/UploadResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/files/UploadResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/files/UploadResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/files/UploadResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/files/UploadResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/DeletePageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/DeletePageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/DeletePageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/DeletePageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/DeletePageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/DeletePageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/DeletePageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/DeletePageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/MovePageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/MovePageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/MovePageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/MovePageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/MovePageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/MovePageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/MovePageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/MovePageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/PageMovementResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/PageMovementResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/PageMovementResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/PageMovementResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RefactorException.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RefactorException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RefactorException.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RefactorException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RefactorPageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RefactorPageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RefactorPageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RefactorPageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RefactorPageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RefactorPageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RefactorPageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RefactorPageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RenamePageResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RenamePageResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RenamePageResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RenamePageResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RenamePageResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RenamePageResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/RenamePageResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/RenamePageResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/SearchReplaceResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/SearchReplaceResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/SearchReplaceResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/SearchReplaceResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/SearchReplaceResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/refactoring/SearchReplaceResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/refactoring/SearchReplaceResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/refactoring/SearchReplaceResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionReport.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionReport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionReport.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionReport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionReportTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionReportTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionReportTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionReportTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionReportTest$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionReportTest$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionReportTest$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionReportTest$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionReportTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionReportTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionReportTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionReportTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionStatus.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionStatus.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExecutionStatus.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/ExecutionStatus.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExposeThreadingIssueInMockResponseTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/ExposeThreadingIssueInMockResponseTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ExposeThreadingIssueInMockResponseTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/ExposeThreadingIssueInMockResponseTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/FitClientResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/FitClientResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/FitClientResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/FitClientResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/FitClientResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/FitClientResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/FitClientResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/FitClientResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$FileCopier.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$FileCopier.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$FileCopier.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$FileCopier.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$FolderResultsRepository.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$FolderResultsRepository.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$FolderResultsRepository.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$FolderResultsRepository.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$ResultsRepository.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$ResultsRepository.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$ResultsRepository.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$ResultsRepository.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$TestResultPage.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$TestResultPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$TestResultPage.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$TestResultPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$TestResultsSummaryTable.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$TestResultsSummaryTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$TestResultsSummaryTable.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$TestResultsSummaryTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$TestResultsSummaryTableRow.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$TestResultsSummaryTableRow.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter$TestResultsSummaryTableRow.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter$TestResultsSummaryTableRow.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatterFolderResultsRepositoryTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatterFolderResultsRepositoryTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatterFolderResultsRepositoryTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatterFolderResultsRepositoryTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/JavaFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/JavaFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MockTestEventListener.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/MockTestEventListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MockTestEventListener.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/MockTestEventListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MultipleTestsRunner.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/MultipleTestsRunner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MultipleTestsRunner.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/MultipleTestsRunner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MultipleTestsRunnerTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/MultipleTestsRunnerTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MultipleTestsRunnerTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/MultipleTestsRunnerTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MultipleTestsRunnerTest$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/MultipleTestsRunnerTest$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MultipleTestsRunnerTest$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/MultipleTestsRunnerTest$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MultipleTestsRunnerTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/MultipleTestsRunnerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/MultipleTestsRunnerTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/MultipleTestsRunnerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/NullListener.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/NullListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/NullListener.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/NullListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/PagesByTestSystem.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/PagesByTestSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/PagesByTestSystem.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/PagesByTestSystem.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/PuppetResponse.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/PuppetResponse.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/PuppetResponse.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/PuppetResponse.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ResponsePuppeteer.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/ResponsePuppeteer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ResponsePuppeteer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/ResponsePuppeteer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ResultsListener.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/ResultsListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/ResultsListener.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/ResultsListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/RunningTestingTracker.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/RunningTestingTracker.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/RunningTestingTracker.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/RunningTestingTracker.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/RunningTestingTrackerTest$StoppedRecorder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/RunningTestingTrackerTest$StoppedRecorder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/RunningTestingTrackerTest$StoppedRecorder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/RunningTestingTrackerTest$StoppedRecorder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/RunningTestingTrackerTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/RunningTestingTrackerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/RunningTestingTrackerTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/RunningTestingTrackerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SocketCatchingResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SocketCatchingResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SocketCatchingResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SocketCatchingResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SocketCatchingResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SocketCatchingResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SocketCatchingResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SocketCatchingResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/StopTestResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/StopTestResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/StopTestResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/StopTestResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/StopTestResponderTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/StopTestResponderTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/StopTestResponderTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/StopTestResponderTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/StopTestResponderTest$StoppedRecorder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/StopTestResponderTest$StoppedRecorder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/StopTestResponderTest$StoppedRecorder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/StopTestResponderTest$StoppedRecorder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/StopTestResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/StopTestResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/StopTestResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/StopTestResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/Stoppable.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/Stoppable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/Stoppable.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/Stoppable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteContentsFinder$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteContentsFinder$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteContentsFinder$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteContentsFinder$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteContentsFinder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteContentsFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteContentsFinder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteContentsFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteContentsFinderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteContentsFinderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteContentsFinderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteContentsFinderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteExecutionReport$PageHistoryReference.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteExecutionReport$PageHistoryReference.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteExecutionReport$PageHistoryReference.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteExecutionReport$PageHistoryReference.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteExecutionReport.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteExecutionReport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteExecutionReport.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteExecutionReport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteExecutionReportTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteExecutionReportTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteExecutionReportTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteExecutionReportTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteFilter$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteFilter$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteFilter$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteFilter$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteFilter$SuiteTagMatcher.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteFilter$SuiteTagMatcher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteFilter$SuiteTagMatcher.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteFilter$SuiteTagMatcher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteFilter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteFilter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteFilter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteFilter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteFilterTestCase.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteFilterTestCase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteFilterTestCase.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteFilterTestCase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteResponder$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteResponder$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteResponder$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteResponder$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteSpecificationRunner.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteSpecificationRunner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteSpecificationRunner.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteSpecificationRunner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteSpecificationRunnerTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteSpecificationRunnerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteSpecificationRunnerTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteSpecificationRunnerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteXmlFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteXmlFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/SuiteXmlFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/SuiteXmlFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestEventListener.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestEventListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestEventListener.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestEventListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$Expectation.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$Expectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$Expectation.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$Expectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$InstructionResult.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$InstructionResult.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$InstructionResult.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$InstructionResult.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$Row.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$Row.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$Row.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$Row.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$Table.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$Table.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$Table.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$Table.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$TestResult.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$TestResult.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport$TestResult.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport$TestResult.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReport.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReportTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReportTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestExecutionReportTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestExecutionReportTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$HistoryWriterFactory.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$HistoryWriterFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$HistoryWriterFactory.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$HistoryWriterFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$TestExecutor.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$TestExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$TestExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$TestExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$WikiPageFooterRenderer.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$WikiPageFooterRenderer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder$WikiPageFooterRenderer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder$WikiPageFooterRenderer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponderTest$WaitForSemaphoreThenStopProcesses.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponderTest$WaitForSemaphoreThenStopProcesses.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponderTest$WaitForSemaphoreThenStopProcesses.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponderTest$WaitForSemaphoreThenStopProcesses.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponderTest$XmlChecker.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponderTest$XmlChecker.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponderTest$XmlChecker.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponderTest$XmlChecker.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponderTest$XmlTestUtilities.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponderTest$XmlTestUtilities.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponderTest$XmlTestUtilities.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponderTest$XmlTestUtilities.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResultFormattingResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResultFormattingResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResultFormattingResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResultFormattingResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResultFormattingResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/TestResultFormattingResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/TestResultFormattingResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/TestResultFormattingResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/BaseFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/BaseFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/BaseFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/BaseFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$3.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$3.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$3.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$4.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$4.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$4.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest$4.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CachingSuiteXmlFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CompositeFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CompositeFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/CompositeFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/CompositeFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/InteractiveFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/InteractiveFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/InteractiveFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/InteractiveFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/NullFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/NullFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/NullFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/NullFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/PageHistoryFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/PageHistoryFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/PageHistoryFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/PageHistoryFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/PageInProgressFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/PageInProgressFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/PageInProgressFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/PageInProgressFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteExecutionReportFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteExecutionReportFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteExecutionReportFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteExecutionReportFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteExecutionReportFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteExecutionReportFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteExecutionReportFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteExecutionReportFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHistoryFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHistoryFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHistoryFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHistoryFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHistoryFormatterTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHistoryFormatterTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHistoryFormatterTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHistoryFormatterTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHistoryFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHistoryFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHistoryFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHistoryFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHtmlFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHtmlFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHtmlFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHtmlFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/SuiteHtmlFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestFormatterTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestFormatterTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestFormatterTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestFormatterTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestFormatterTest$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestFormatterTest$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestFormatterTest$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestFormatterTest$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestFormatterTest$3.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestFormatterTest$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestFormatterTest$3.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestFormatterTest$3.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestHtmlFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestHtmlFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestHtmlFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestHtmlFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestHtmlFormatterTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestHtmlFormatterTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestHtmlFormatterTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestHtmlFormatterTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestHtmlFormatterTest$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestHtmlFormatterTest$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestHtmlFormatterTest$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestHtmlFormatterTest$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestHtmlFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestHtmlFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestHtmlFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestHtmlFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestTextFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestTextFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestTextFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestTextFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestTextFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestTextFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/TestTextFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/TestTextFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatter$WriterFactory.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatter$WriterFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatter$WriterFactory.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatter$WriterFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatter.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatterTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatterTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatterTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatterTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatterTest$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatterTest$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatterTest$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatterTest$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatterTest$3.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatterTest$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatterTest$3.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatterTest$3.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/formatters/XmlFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/formatters/XmlFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/HtmlSlimResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/HtmlSlimResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/HtmlSlimResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/HtmlSlimResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest$DummyListener.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest$DummyListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest$DummyListener.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest$DummyListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/HtmlSlimResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/SlimResponder$SlimRenderer.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/SlimResponder$SlimRenderer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/SlimResponder$SlimRenderer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/SlimResponder$SlimRenderer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/SlimResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/SlimResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/run/slimResponder/SlimResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/run/slimResponder/SlimResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/ExecuteSearchPropertiesResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/ExecuteSearchPropertiesResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/ExecuteSearchPropertiesResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/ExecuteSearchPropertiesResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/ExecuteSearchPropertiesResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/ExecuteSearchPropertiesResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/ExecuteSearchPropertiesResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/ExecuteSearchPropertiesResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/ResultResponder$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/ResultResponder$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/ResultResponder$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/ResultResponder$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/ResultResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/ResultResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/ResultResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/ResultResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/SearchFormResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/SearchFormResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/SearchFormResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/SearchFormResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/SearchFormResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/SearchFormResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/SearchFormResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/SearchFormResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/SearchResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/SearchResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/SearchResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/SearchResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/SearchResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/SearchResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/SearchResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/SearchResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/WhereUsedResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/WhereUsedResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/WhereUsedResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/WhereUsedResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/search/WhereUsedResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/search/WhereUsedResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/search/WhereUsedResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/search/WhereUsedResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/ClasspathResourceLoader.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/ClasspathResourceLoader.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/ClasspathResourceLoader.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/ClasspathResourceLoader.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/EscapeDirective.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/EscapeDirective.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/EscapeDirective.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/EscapeDirective.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/HtmlPage.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/HtmlPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/HtmlPage.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/HtmlPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/HtmlPageTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/HtmlPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/HtmlPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/HtmlPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/PageTitle$BreadCrumb.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/PageTitle$BreadCrumb.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/PageTitle$BreadCrumb.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/PageTitle$BreadCrumb.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/PageTitle.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/PageTitle.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/PageTitle.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/PageTitle.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/PageTitleTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/PageTitleTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/PageTitleTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/PageTitleTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/TraverseDirective.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/TraverseDirective.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/TraverseDirective.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/TraverseDirective.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/TraverseDirectiveTest$MockTraverser.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/TraverseDirectiveTest$MockTraverser.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/TraverseDirectiveTest$MockTraverser.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/TraverseDirectiveTest$MockTraverser.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/TraverseDirectiveTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/TraverseDirectiveTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/templateUtilities/TraverseDirectiveTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/templateUtilities/TraverseDirectiveTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$FirstResultAdjustmentStrategy.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$FirstResultAdjustmentStrategy.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$FirstResultAdjustmentStrategy.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$FirstResultAdjustmentStrategy.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$MatchedPair.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$MatchedPair.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$MatchedPair.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$MatchedPair.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$ResultAdjustmentStrategy.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$ResultAdjustmentStrategy.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$ResultAdjustmentStrategy.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$ResultAdjustmentStrategy.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$SecondResultAdjustmentStrategy.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$SecondResultAdjustmentStrategy.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer$SecondResultAdjustmentStrategy.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer$SecondResultAdjustmentStrategy.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparerResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparerResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparerResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparerResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparerResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparerResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparerResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparerResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparerTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparerTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparerTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparerTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparerTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/HistoryComparerTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/HistoryComparerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/MostRecentPageHistoryReader.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/MostRecentPageHistoryReader.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/MostRecentPageHistoryReader.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/MostRecentPageHistoryReader.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory$BarGraph.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory$BarGraph.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory$BarGraph.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory$BarGraph.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory$PassFailBar.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory$PassFailBar.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory$PassFailBar.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory$PassFailBar.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory$PassFailReport.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory$PassFailReport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory$PassFailReport.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory$PassFailReport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistory.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistoryReader.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistoryReader.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistoryReader.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistoryReader.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistoryResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistoryResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistoryResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistoryResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistoryResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistoryResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PageHistoryResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PageHistoryResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PurgeHistoryResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PurgeHistoryResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PurgeHistoryResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PurgeHistoryResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PurgeHistoryResponderTest$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PurgeHistoryResponderTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PurgeHistoryResponderTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PurgeHistoryResponderTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PurgeHistoryResponderTest$StubbedPurgeHistoryResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PurgeHistoryResponderTest$StubbedPurgeHistoryResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PurgeHistoryResponderTest$StubbedPurgeHistoryResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PurgeHistoryResponderTest$StubbedPurgeHistoryResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PurgeHistoryResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PurgeHistoryResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/PurgeHistoryResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/PurgeHistoryResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$3.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$3.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$3.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$RecursiveTreeMethod.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$RecursiveTreeMethod.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$RecursiveTreeMethod.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$RecursiveTreeMethod.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$TreeItem.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$TreeItem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree$TreeItem.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree$TreeItem.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTree.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTree.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTreeTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTreeTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/SuiteOverviewTreeTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/SuiteOverviewTreeTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparer$1.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparer$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparer$1.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparer$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparer$2.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparer$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparer$2.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparer$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparer$TableComparer.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparer$TableComparer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparer$TableComparer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparer$TableComparer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparer.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparerTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TableListComparerTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TableListComparerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TestHistory.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TestHistory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TestHistory.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TestHistory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TestHistoryResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TestHistoryResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TestHistoryResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TestHistoryResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TestHistoryResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TestHistoryResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TestHistoryResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TestHistoryResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TestResultRecord.class b/src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TestResultRecord.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/testHistory/TestResultRecord.class rename to src/test/resources/fitnesse-target/fitnesse/responders/testHistory/TestResultRecord.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/RollbackResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/RollbackResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/RollbackResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/RollbackResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/RollbackResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/RollbackResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/RollbackResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/RollbackResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionComparer.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionComparer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionComparer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionComparer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionComparerResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionComparerResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionComparerResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionComparerResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionComparerResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionComparerResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionComparerResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionComparerResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionComparerTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionComparerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionComparerTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionComparerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionResponder$VersionRenderer.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionResponder$VersionRenderer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionResponder$VersionRenderer.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionResponder$VersionRenderer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionSelectionResponder.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionSelectionResponder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionSelectionResponder.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionSelectionResponder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionSelectionResponderTest.class b/src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionSelectionResponderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/responders/versions/VersionSelectionResponderTest.class rename to src/test/resources/fitnesse-target/fitnesse/responders/versions/VersionSelectionResponderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/CachingResultFormatter.class b/src/test/resources/fitnesse-target/fitnesse/runner/CachingResultFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/CachingResultFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/runner/CachingResultFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/CachingResultFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/runner/CachingResultFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/CachingResultFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/runner/CachingResultFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/FormattingOption.class b/src/test/resources/fitnesse-target/fitnesse/runner/FormattingOption.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/FormattingOption.class rename to src/test/resources/fitnesse-target/fitnesse/runner/FormattingOption.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/FormattingOptionTest.class b/src/test/resources/fitnesse-target/fitnesse/runner/FormattingOptionTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/FormattingOptionTest.class rename to src/test/resources/fitnesse-target/fitnesse/runner/FormattingOptionTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/HtmlResultFormatter$1.class b/src/test/resources/fitnesse-target/fitnesse/runner/HtmlResultFormatter$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/HtmlResultFormatter$1.class rename to src/test/resources/fitnesse-target/fitnesse/runner/HtmlResultFormatter$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/HtmlResultFormatter.class b/src/test/resources/fitnesse-target/fitnesse/runner/HtmlResultFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/HtmlResultFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/runner/HtmlResultFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/HtmlResultFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/runner/HtmlResultFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/HtmlResultFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/runner/HtmlResultFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/MockResultFormatter.class b/src/test/resources/fitnesse-target/fitnesse/runner/MockResultFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/MockResultFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/runner/MockResultFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/PageResult.class b/src/test/resources/fitnesse-target/fitnesse/runner/PageResult.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/PageResult.class rename to src/test/resources/fitnesse-target/fitnesse/runner/PageResult.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/PageResultTest.class b/src/test/resources/fitnesse-target/fitnesse/runner/PageResultTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/PageResultTest.class rename to src/test/resources/fitnesse-target/fitnesse/runner/PageResultTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/ResultFormatter.class b/src/test/resources/fitnesse-target/fitnesse/runner/ResultFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/ResultFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/runner/ResultFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/ResultHandler.class b/src/test/resources/fitnesse-target/fitnesse/runner/ResultHandler.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/ResultHandler.class rename to src/test/resources/fitnesse-target/fitnesse/runner/ResultHandler.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/StandardResultHandler.class b/src/test/resources/fitnesse-target/fitnesse/runner/StandardResultHandler.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/StandardResultHandler.class rename to src/test/resources/fitnesse-target/fitnesse/runner/StandardResultHandler.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/StandardResultHandlerTest.class b/src/test/resources/fitnesse-target/fitnesse/runner/StandardResultHandlerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/StandardResultHandlerTest.class rename to src/test/resources/fitnesse-target/fitnesse/runner/StandardResultHandlerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/XmlResultFormatter.class b/src/test/resources/fitnesse-target/fitnesse/runner/XmlResultFormatter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/XmlResultFormatter.class rename to src/test/resources/fitnesse-target/fitnesse/runner/XmlResultFormatter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/runner/XmlResultFormatterTest.class b/src/test/resources/fitnesse-target/fitnesse/runner/XmlResultFormatterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/runner/XmlResultFormatterTest.class rename to src/test/resources/fitnesse-target/fitnesse/runner/XmlResultFormatterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/schedule/NullSchedule.class b/src/test/resources/fitnesse-target/fitnesse/schedule/NullSchedule.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/schedule/NullSchedule.class rename to src/test/resources/fitnesse-target/fitnesse/schedule/NullSchedule.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/schedule/Schedule.class b/src/test/resources/fitnesse-target/fitnesse/schedule/Schedule.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/schedule/Schedule.class rename to src/test/resources/fitnesse-target/fitnesse/schedule/Schedule.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleImpl.class b/src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleImpl.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleImpl.class rename to src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleImpl.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleItem.class b/src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleItem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleItem.class rename to src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleItem.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest$1.class b/src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest$Counter.class b/src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest$Counter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest$Counter.class rename to src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest$Counter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest$ExceptionThrower.class b/src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest$ExceptionThrower.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest$ExceptionThrower.class rename to src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest$ExceptionThrower.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest$Sleeper.class b/src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest$Sleeper.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest$Sleeper.class rename to src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest$Sleeper.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest.class b/src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/schedule/ScheduleTest.class rename to src/test/resources/fitnesse-target/fitnesse/schedule/ScheduleTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Converter.class b/src/test/resources/fitnesse-target/fitnesse/slim/Converter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Converter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Converter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/ConverterSupport.class b/src/test/resources/fitnesse-target/fitnesse/slim/ConverterSupport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/ConverterSupport.class rename to src/test/resources/fitnesse-target/fitnesse/slim/ConverterSupport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/ConverterTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/ConverterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/ConverterTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/ConverterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/FixtureMethodExecutor.class b/src/test/resources/fitnesse-target/fitnesse/slim/FixtureMethodExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/FixtureMethodExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/FixtureMethodExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/HashWidgetConversionTest$MapConstructor.class b/src/test/resources/fitnesse-target/fitnesse/slim/HashWidgetConversionTest$MapConstructor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/HashWidgetConversionTest$MapConstructor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/HashWidgetConversionTest$MapConstructor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/HashWidgetConversionTest$MapReceptor.class b/src/test/resources/fitnesse-target/fitnesse/slim/HashWidgetConversionTest$MapReceptor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/HashWidgetConversionTest$MapReceptor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/HashWidgetConversionTest$MapReceptor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/HashWidgetConversionTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/HashWidgetConversionTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/HashWidgetConversionTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/HashWidgetConversionTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/HashWidgetConversionTestBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/HashWidgetConversionTestBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/HashWidgetConversionTestBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/HashWidgetConversionTestBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/JavaSlimFactory.class b/src/test/resources/fitnesse-target/fitnesse/slim/JavaSlimFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/JavaSlimFactory.class rename to src/test/resources/fitnesse-target/fitnesse/slim/JavaSlimFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223Bridge.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223Bridge.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223Bridge.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223Bridge.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223SlimFactory.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223SlimFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223SlimFactory.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223SlimFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutor.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$EchoSupportJsr223.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$EchoSupportJsr223.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$EchoSupportJsr223.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$EchoSupportJsr223.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$FileSupportJsr223.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$FileSupportJsr223.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$FileSupportJsr223.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$FileSupportJsr223.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$FixtureProxyJsr223.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$FixtureProxyJsr223.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$FixtureProxyJsr223.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$FixtureProxyJsr223.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$FixtureWithNamedSystemUnderTestJsr223.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$FixtureWithNamedSystemUnderTestJsr223.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$FixtureWithNamedSystemUnderTestJsr223.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$FixtureWithNamedSystemUnderTestJsr223.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$MyAnnotatedSystemUnderTestFixtureJsr223.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$MyAnnotatedSystemUnderTestFixtureJsr223.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$MyAnnotatedSystemUnderTestFixtureJsr223.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$MyAnnotatedSystemUnderTestFixtureJsr223.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$MySystemUnderTestJsr223.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$MySystemUnderTestJsr223.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$MySystemUnderTestJsr223.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$MySystemUnderTestJsr223.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$SimpleFixtureJsr223.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$SimpleFixtureJsr223.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase$SimpleFixtureJsr223.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase$SimpleFixtureJsr223.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Jsr223StatementExecutorTestBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Jsr223StatementExecutorTestBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Library.class b/src/test/resources/fitnesse-target/fitnesse/slim/Library.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Library.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Library.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/LibraryMethodExecutor.class b/src/test/resources/fitnesse-target/fitnesse/slim/LibraryMethodExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/LibraryMethodExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/LibraryMethodExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutor$1.class b/src/test/resources/fitnesse-target/fitnesse/slim/ListExecutor$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutor$1.class rename to src/test/resources/fitnesse-target/fitnesse/slim/ListExecutor$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutor$Executive.class b/src/test/resources/fitnesse-target/fitnesse/slim/ListExecutor$Executive.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutor$Executive.class rename to src/test/resources/fitnesse-target/fitnesse/slim/ListExecutor$Executive.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutor$LoggingExecutive.class b/src/test/resources/fitnesse-target/fitnesse/slim/ListExecutor$LoggingExecutive.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutor$LoggingExecutive.class rename to src/test/resources/fitnesse-target/fitnesse/slim/ListExecutor$LoggingExecutive.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutor.class b/src/test/resources/fitnesse-target/fitnesse/slim/ListExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/ListExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutorTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/ListExecutorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutorTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/ListExecutorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutorTestBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/ListExecutorTestBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/ListExecutorTestBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/ListExecutorTestBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResult$1.class b/src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResult$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResult$1.class rename to src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResult$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResult$NoInstance.class b/src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResult$NoInstance.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResult$NoInstance.class rename to src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResult$NoInstance.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResult$NoMethod.class b/src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResult$NoMethod.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResult$NoMethod.class rename to src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResult$NoMethod.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResult.class b/src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResult.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResult.class rename to src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResult.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResults.class b/src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResults.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutionResults.class rename to src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutionResults.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutor.class b/src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/MethodExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/MethodExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/NameTranslator.class b/src/test/resources/fitnesse-target/fitnesse/slim/NameTranslator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/NameTranslator.class rename to src/test/resources/fitnesse-target/fitnesse/slim/NameTranslator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/NameTranslatorIdentity.class b/src/test/resources/fitnesse-target/fitnesse/slim/NameTranslatorIdentity.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/NameTranslatorIdentity.class rename to src/test/resources/fitnesse-target/fitnesse/slim/NameTranslatorIdentity.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/Slim.class b/src/test/resources/fitnesse-target/fitnesse/slim/Slim.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/Slim.class rename to src/test/resources/fitnesse-target/fitnesse/slim/Slim.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimClient$1.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimClient$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimClient$1.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimClient$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimClient$ToListExecutor.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimClient$ToListExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimClient$ToListExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimClient$ToListExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimClient.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimClient.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimClient.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimClient.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimError.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimError.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimError.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimError.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimException.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimException.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimExecutionContext.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimExecutionContext.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimExecutionContext.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimExecutionContext.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimExecutionContextTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimExecutionContextTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimExecutionContextTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimExecutionContextTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimFactory.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimFactory.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimHelperLibrary.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimHelperLibrary.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimHelperLibrary.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimHelperLibrary.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimHelperLibraryTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimHelperLibraryTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimHelperLibraryTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimHelperLibraryTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimInstanceCreationTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimInstanceCreationTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimInstanceCreationTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimInstanceCreationTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimInstanceCreationTestBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimInstanceCreationTestBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimInstanceCreationTestBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimInstanceCreationTestBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimMethodInvocationTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimMethodInvocationTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimMethodInvocationTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimMethodInvocationTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimMethodInvocationTestBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimMethodInvocationTestBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimMethodInvocationTestBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimMethodInvocationTestBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimServer.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimServer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimServer.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimServer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimService$1.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimService$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimService$1.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimService$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimService.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimService.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimService.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimService.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimServiceTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimServiceTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimServiceTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimServiceTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimServiceTestBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimServiceTestBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimServiceTestBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimServiceTestBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimVersion.class b/src/test/resources/fitnesse-target/fitnesse/slim/SlimVersion.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SlimVersion.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SlimVersion.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StackTraceEnricher$ClassMetaInformation.class b/src/test/resources/fitnesse-target/fitnesse/slim/StackTraceEnricher$ClassMetaInformation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StackTraceEnricher$ClassMetaInformation.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StackTraceEnricher$ClassMetaInformation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StackTraceEnricher.class b/src/test/resources/fitnesse-target/fitnesse/slim/StackTraceEnricher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StackTraceEnricher.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StackTraceEnricher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StackTraceEnricherTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/StackTraceEnricherTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StackTraceEnricherTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StackTraceEnricherTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutor.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorConsumer.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorConsumer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorConsumer.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorConsumer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorInterface.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorInterface.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorInterface.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorInterface.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$EchoSupportJava.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$EchoSupportJava.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$EchoSupportJava.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$EchoSupportJava.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$FileSupportJava.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$FileSupportJava.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$FileSupportJava.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$FileSupportJava.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$FixtureWithNamedSystemUnderTestJava.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$FixtureWithNamedSystemUnderTestJava.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$FixtureWithNamedSystemUnderTestJava.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$FixtureWithNamedSystemUnderTestJava.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$MyAnnotatedSystemUnderTestFixtureJava.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$MyAnnotatedSystemUnderTestFixtureJava.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$MyAnnotatedSystemUnderTestFixtureJava.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$MyAnnotatedSystemUnderTestFixtureJava.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$MySystemUnderTestJava.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$MySystemUnderTestJava.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$MySystemUnderTestJava.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$MySystemUnderTestJava.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$SimpleFixtureJava.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$SimpleFixtureJava.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest$SimpleFixtureJava.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest$SimpleFixtureJava.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$Delete.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$Delete.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$Delete.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$Delete.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$Echo.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$Echo.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$Echo.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$Echo.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$EchoSupport.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$EchoSupport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$EchoSupport.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$EchoSupport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$FileSupport.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$FileSupport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$FileSupport.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$FileSupport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$FixtureWithNamedSystemUnderTestBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$FixtureWithNamedSystemUnderTestBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$FixtureWithNamedSystemUnderTestBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$FixtureWithNamedSystemUnderTestBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$MyAnnotatedSystemUnderTestFixture.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$MyAnnotatedSystemUnderTestFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$MyAnnotatedSystemUnderTestFixture.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$MyAnnotatedSystemUnderTestFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$MySystemUnderTestBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$MySystemUnderTestBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$MySystemUnderTestBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$MySystemUnderTestBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$SimpleFixture.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$SimpleFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$SimpleFixture.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$SimpleFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$Speak.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$Speak.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$Speak.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$Speak.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$SystemUnderTestFixture.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$SystemUnderTestFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase$SystemUnderTestFixture.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase$SystemUnderTestFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StatementExecutorTestBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StatementExecutorTestBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/StopTestSlimException.class b/src/test/resources/fitnesse-target/fitnesse/slim/StopTestSlimException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/StopTestSlimException.class rename to src/test/resources/fitnesse-target/fitnesse/slim/StopTestSlimException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SystemUnderTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/SystemUnderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SystemUnderTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SystemUnderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/SystemUnderTestMethodExecutor.class b/src/test/resources/fitnesse-target/fitnesse/slim/SystemUnderTestMethodExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/SystemUnderTestMethodExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/SystemUnderTestMethodExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/VariableStore.class b/src/test/resources/fitnesse-target/fitnesse/slim/VariableStore.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/VariableStore.class rename to src/test/resources/fitnesse-target/fitnesse/slim/VariableStore.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/BooleanArrayConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/BooleanArrayConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/BooleanArrayConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/BooleanArrayConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/BooleanConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/BooleanConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/BooleanConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/BooleanConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/CharConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/CharConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/CharConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/CharConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ConverterRegistry.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/ConverterRegistry.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ConverterRegistry.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/ConverterRegistry.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ConverterRegistryTest$CustomClass.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/ConverterRegistryTest$CustomClass.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ConverterRegistryTest$CustomClass.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/ConverterRegistryTest$CustomClass.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ConverterRegistryTest$CustomConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/ConverterRegistryTest$CustomConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ConverterRegistryTest$CustomConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/ConverterRegistryTest$CustomConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ConverterRegistryTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/ConverterRegistryTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ConverterRegistryTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/ConverterRegistryTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/DateConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/DateConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/DateConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/DateConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/DoubleArrayConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/DoubleArrayConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/DoubleArrayConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/DoubleArrayConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/DoubleConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/DoubleConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/DoubleConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/DoubleConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/EnumConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/EnumConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/EnumConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/EnumConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/IntConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/IntConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/IntConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/IntConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/IntegerArrayConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/IntegerArrayConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/IntegerArrayConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/IntegerArrayConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ListConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/ListConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/ListConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/ListConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/MapConverterTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/MapConverterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/MapConverterTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/MapConverterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/MapEditor.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/MapEditor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/MapEditor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/MapEditor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/PropertyEditorConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/PropertyEditorConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/PropertyEditorConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/PropertyEditorConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/StringArrayConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/StringArrayConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/StringArrayConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/StringArrayConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/StringConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/StringConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/StringConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/StringConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/VoidConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/converters/VoidConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/converters/VoidConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/converters/VoidConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/DefaultInteraction.class b/src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/DefaultInteraction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/DefaultInteraction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/DefaultInteraction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/DefaultInteractionTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/DefaultInteractionTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/DefaultInteractionTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/DefaultInteractionTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/FixtureInteraction.class b/src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/FixtureInteraction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/FixtureInteraction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/FixtureInteraction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/InteractionDemo.class b/src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/InteractionDemo.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/InteractionDemo.class rename to src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/InteractionDemo.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/LoggingInteraction.class b/src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/LoggingInteraction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/LoggingInteraction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/LoggingInteraction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/MockingInteraction.class b/src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/MockingInteraction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/MockingInteraction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/MockingInteraction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/Testee.class b/src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/Testee.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/fixtureInteraction/Testee.class rename to src/test/resources/fitnesse-target/fitnesse/slim/fixtureInteraction/Testee.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/CallAndAssignInstruction.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/CallAndAssignInstruction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/CallAndAssignInstruction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/CallAndAssignInstruction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/CallAndAssignInstructionTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/CallAndAssignInstructionTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/CallAndAssignInstructionTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/CallAndAssignInstructionTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/CallInstruction.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/CallInstruction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/CallInstruction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/CallInstruction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/CallInstructionTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/CallInstructionTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/CallInstructionTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/CallInstructionTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/ImportInstruction.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/ImportInstruction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/ImportInstruction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/ImportInstruction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/ImportInstructionTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/ImportInstructionTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/ImportInstructionTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/ImportInstructionTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/Instruction$1.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/Instruction$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/Instruction$1.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/Instruction$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/Instruction.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/Instruction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/Instruction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/Instruction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionExecutor.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionExecutor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionExecutor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionExecutor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionFactory.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionFactory.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionResult$Error.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionResult$Error.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionResult$Error.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionResult$Error.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionResult$Ok.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionResult$Ok.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionResult$Ok.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionResult$Ok.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionResult$Void.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionResult$Void.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionResult$Void.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionResult$Void.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionResult.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionResult.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InstructionResult.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/InstructionResult.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InvalidInstruction.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/InvalidInstruction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InvalidInstruction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/InvalidInstruction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InvalidInstructionTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/InvalidInstructionTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/InvalidInstructionTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/InvalidInstructionTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/MakeInstruction.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/MakeInstruction.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/MakeInstruction.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/MakeInstruction.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/MakeInstructionTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/MakeInstructionTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/MakeInstructionTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/MakeInstructionTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/SystemExitSecurityManager$SystemExitException.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/SystemExitSecurityManager$SystemExitException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/SystemExitSecurityManager$SystemExitException.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/SystemExitSecurityManager$SystemExitException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/SystemExitSecurityManager.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/SystemExitSecurityManager.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/SystemExitSecurityManager.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/SystemExitSecurityManager.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/SystemExitSecurityManagerTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/instructions/SystemExitSecurityManagerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/instructions/SystemExitSecurityManagerTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/instructions/SystemExitSecurityManagerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SlimDeserializer.class b/src/test/resources/fitnesse-target/fitnesse/slim/protocol/SlimDeserializer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SlimDeserializer.class rename to src/test/resources/fitnesse-target/fitnesse/slim/protocol/SlimDeserializer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SlimDeserializerTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/protocol/SlimDeserializerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SlimDeserializerTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/protocol/SlimDeserializerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SlimSerializer.class b/src/test/resources/fitnesse-target/fitnesse/slim/protocol/SlimSerializer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SlimSerializer.class rename to src/test/resources/fitnesse-target/fitnesse/slim/protocol/SlimSerializer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SlimSerializerTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/protocol/SlimSerializerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SlimSerializerTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/protocol/SlimSerializerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SyntaxError.class b/src/test/resources/fitnesse-target/fitnesse/slim/protocol/SyntaxError.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/protocol/SyntaxError.class rename to src/test/resources/fitnesse-target/fitnesse/slim/protocol/SyntaxError.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/AnEnum.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/AnEnum.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/AnEnum.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/AnEnum.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/AnotherEnum.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/AnotherEnum.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/AnotherEnum.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/AnotherEnum.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/AnotherEnumEditor.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/AnotherEnumEditor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/AnotherEnumEditor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/AnotherEnumEditor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Bowling$1.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/Bowling$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Bowling$1.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/Bowling$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Bowling$Game$Scorer.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/Bowling$Game$Scorer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Bowling$Game$Scorer.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/Bowling$Game$Scorer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Bowling$Game.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/Bowling$Game.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Bowling$Game.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/Bowling$Game.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Bowling.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/Bowling.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Bowling.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/Bowling.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/BowlingFixtureTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/BowlingFixtureTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/BowlingFixtureTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/BowlingFixtureTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ClassWithNoPublicDefaultConstructor.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/ClassWithNoPublicDefaultConstructor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ClassWithNoPublicDefaultConstructor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/ClassWithNoPublicDefaultConstructor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ConstructorThrows.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/ConstructorThrows.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ConstructorThrows.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/ConstructorThrows.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DecisionTableAllDoneWrong.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/DecisionTableAllDoneWrong.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DecisionTableAllDoneWrong.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/DecisionTableAllDoneWrong.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DecisionTableExecuteThrows.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/DecisionTableExecuteThrows.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DecisionTableExecuteThrows.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/DecisionTableExecuteThrows.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Describable.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/Describable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Describable.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/Describable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DescribableBase.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/DescribableBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DescribableBase.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/DescribableBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DoTableThrowsReportableException.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/DoTableThrowsReportableException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DoTableThrowsReportableException.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/DoTableThrowsReportableException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DummyDecisionTable.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/DummyDecisionTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DummyDecisionTable.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/DummyDecisionTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DummyDecisionTableWithExecuteButNoReset.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/DummyDecisionTableWithExecuteButNoReset.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DummyDecisionTableWithExecuteButNoReset.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/DummyDecisionTableWithExecuteButNoReset.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DummyQueryTableWithNoTableMethod.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/DummyQueryTableWithNoTableMethod.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DummyQueryTableWithNoTableMethod.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/DummyQueryTableWithNoTableMethod.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DummyTableTableReturnsNull.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/DummyTableTableReturnsNull.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/DummyTableTableReturnsNull.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/DummyTableTableReturnsNull.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/EchoScript.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/EchoScript.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/EchoScript.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/EchoScript.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/EmployeesHiredBefore.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/EmployeesHiredBefore.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/EmployeesHiredBefore.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/EmployeesHiredBefore.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ExecuteThrowsReportableException.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/ExecuteThrowsReportableException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ExecuteThrowsReportableException.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/ExecuteThrowsReportableException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/LoginDialogDriver.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/LoginDialogDriver.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/LoginDialogDriver.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/LoginDialogDriver.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/MySystemUnderTest.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/MySystemUnderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/MySystemUnderTest.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/MySystemUnderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/MySystemUnderTestDriver.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/MySystemUnderTestDriver.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/MySystemUnderTestDriver.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/MySystemUnderTestDriver.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/NullFixture.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/NullFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/NullFixture.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/NullFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ShouldIBuyMilk.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/ShouldIBuyMilk.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ShouldIBuyMilk.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/ShouldIBuyMilk.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestQuery.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/TestQuery.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestQuery.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/TestQuery.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestSlim$NoSuchConverter.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/TestSlim$NoSuchConverter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestSlim$NoSuchConverter.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/TestSlim$NoSuchConverter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestSlim$StopTestException.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/TestSlim$StopTestException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestSlim$StopTestException.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/TestSlim$StopTestException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestSlim.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/TestSlim.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestSlim.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/TestSlim.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestSlimInterface.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/TestSlimInterface.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestSlimInterface.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/TestSlimInterface.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestTable.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/TestTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/TestTable.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/TestTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Zork.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/Zork.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/Zork.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/Zork.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ZorkEditor.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/ZorkEditor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/ZorkEditor.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/ZorkEditor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/library/EchoSupport.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/library/EchoSupport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/library/EchoSupport.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/library/EchoSupport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/library/LibraryFixture.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/library/LibraryFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/library/LibraryFixture.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/library/LibraryFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/library/LibraryInSetUp.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/library/LibraryInSetUp.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/library/LibraryInSetUp.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/library/LibraryInSetUp.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/library/SpecialEchoSupport.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/library/SpecialEchoSupport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/library/SpecialEchoSupport.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/library/SpecialEchoSupport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/slim/test/testSlimInThisPackageShouldNotBeTheOneUsed/TestSlim.class b/src/test/resources/fitnesse-target/fitnesse/slim/test/testSlimInThisPackageShouldNotBeTheOneUsed/TestSlim.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/slim/test/testSlimInThisPackageShouldNotBeTheOneUsed/TestSlim.class rename to src/test/resources/fitnesse-target/fitnesse/slim/test/testSlimInThisPackageShouldNotBeTheOneUsed/TestSlim.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/socketservice/EchoService.class b/src/test/resources/fitnesse-target/fitnesse/socketservice/EchoService.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/socketservice/EchoService.class rename to src/test/resources/fitnesse-target/fitnesse/socketservice/EchoService.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/socketservice/HelloService.class b/src/test/resources/fitnesse-target/fitnesse/socketservice/HelloService.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/socketservice/HelloService.class rename to src/test/resources/fitnesse-target/fitnesse/socketservice/HelloService.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketServer$StreamUtility.class b/src/test/resources/fitnesse-target/fitnesse/socketservice/SocketServer$StreamUtility.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketServer$StreamUtility.class rename to src/test/resources/fitnesse-target/fitnesse/socketservice/SocketServer$StreamUtility.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketServer.class b/src/test/resources/fitnesse-target/fitnesse/socketservice/SocketServer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketServer.class rename to src/test/resources/fitnesse-target/fitnesse/socketservice/SocketServer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketService$1.class b/src/test/resources/fitnesse-target/fitnesse/socketservice/SocketService$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketService$1.class rename to src/test/resources/fitnesse-target/fitnesse/socketservice/SocketService$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketService$ServerRunner.class b/src/test/resources/fitnesse-target/fitnesse/socketservice/SocketService$ServerRunner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketService$ServerRunner.class rename to src/test/resources/fitnesse-target/fitnesse/socketservice/SocketService$ServerRunner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketService.class b/src/test/resources/fitnesse-target/fitnesse/socketservice/SocketService.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketService.class rename to src/test/resources/fitnesse-target/fitnesse/socketservice/SocketService.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketServiceTest$1.class b/src/test/resources/fitnesse-target/fitnesse/socketservice/SocketServiceTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketServiceTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/socketservice/SocketServiceTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketServiceTest.class b/src/test/resources/fitnesse-target/fitnesse/socketservice/SocketServiceTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/socketservice/SocketServiceTest.class rename to src/test/resources/fitnesse-target/fitnesse/socketservice/SocketServiceTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CommandRunner$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/CommandRunner$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CommandRunner$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/CommandRunner$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CommandRunner$OutputReadingRunnable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/CommandRunner$OutputReadingRunnable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CommandRunner$OutputReadingRunnable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/CommandRunner$OutputReadingRunnable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CommandRunner.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/CommandRunner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CommandRunner.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/CommandRunner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CommandRunnerTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/CommandRunnerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CommandRunnerTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/CommandRunnerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CompositeExecutionLog.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/CompositeExecutionLog.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CompositeExecutionLog.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/CompositeExecutionLog.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CompositeExecutionLogTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/CompositeExecutionLogTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/CompositeExecutionLogTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/CompositeExecutionLogTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/ExecutionLog.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/ExecutionLog.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/ExecutionLog.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/ExecutionLog.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/ExecutionLogTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/ExecutionLogTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/ExecutionLogTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/ExecutionLogTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/ExecutionResult.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/ExecutionResult.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/ExecutionResult.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/ExecutionResult.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/ExecutionResultTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/ExecutionResultTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/ExecutionResultTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/ExecutionResultTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/MockCommandRunner.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/MockCommandRunner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/MockCommandRunner.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/MockCommandRunner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/PageListSetUpTearDownSurrounder.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/PageListSetUpTearDownSurrounder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/PageListSetUpTearDownSurrounder.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/PageListSetUpTearDownSurrounder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/PageListSetUpTearDownSurrounderTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/PageListSetUpTearDownSurrounderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/PageListSetUpTearDownSurrounderTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/PageListSetUpTearDownSurrounderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestPage.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestPage.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestPageTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestPageWithSuiteSetUpAndTearDown.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestPageWithSuiteSetUpAndTearDown.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestPageWithSuiteSetUpAndTearDown.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestPageWithSuiteSetUpAndTearDown.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSummary$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestSummary$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSummary$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestSummary$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSummary.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestSummary.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSummary.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestSummary.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSummaryTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestSummaryTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSummaryTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestSummaryTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystem$Descriptor.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystem$Descriptor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystem$Descriptor.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystem$Descriptor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystem.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystem.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystem.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystemGroup.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystemGroup.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystemGroup.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystemGroup.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystemListener.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystemListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystemListener.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystemListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystemTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystemTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/TestSystemTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/TestSystemTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$CommandRunningStrategy.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$CommandRunningStrategy.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$CommandRunningStrategy.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$CommandRunningStrategy.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$InProcessCommandRunner$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$InProcessCommandRunner$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$InProcessCommandRunner$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$InProcessCommandRunner$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$InProcessCommandRunner.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$InProcessCommandRunner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$InProcessCommandRunner.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$InProcessCommandRunner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner$EarlyTerminationRunnable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner$EarlyTerminationRunnable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner$EarlyTerminationRunnable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner$EarlyTerminationRunnable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner$TimeoutRunnable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner$TimeoutRunnable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner$TimeoutRunnable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner$TimeoutRunnable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient$OutOfProcessCommandRunner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/CommandRunningFitClient.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/CommandRunningFitClient.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClient$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClient$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClient$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClient$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClient$FitListeningRunnable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClient$FitListeningRunnable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClient$FitListeningRunnable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClient$FitListeningRunnable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClient.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClient.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClient.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClient.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClientTest$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClientTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClientTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClientTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClientTest$CustomFitSocketReceiver.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClientTest$CustomFitSocketReceiver.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClientTest$CustomFitSocketReceiver.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClientTest$CustomFitSocketReceiver.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClientTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClientTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitClientTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitClientTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitSocketReceiver$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitSocketReceiver$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitSocketReceiver$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitSocketReceiver$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitSocketReceiver.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitSocketReceiver.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitSocketReceiver.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitSocketReceiver.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitTestSystem.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitTestSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/FitTestSystem.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/FitTestSystem.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/SimpleSocketDoner.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/SimpleSocketDoner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/SimpleSocketDoner.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/SimpleSocketDoner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/SimpleSocketSeeker.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/SimpleSocketSeeker.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/SimpleSocketSeeker.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/SimpleSocketSeeker.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/SocketDoner.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/SocketDoner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/SocketDoner.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/SocketDoner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/SocketSeeker.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/fit/SocketSeeker.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/fit/SocketSeeker.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/fit/SocketSeeker.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlSlimTestSystem.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlSlimTestSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlSlimTestSystem.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlSlimTestSystem.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTable$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTable$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTable$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTable$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTable$Cell.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTable$Cell.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTable$Cell.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTable$Cell.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTable$Row.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTable$Row.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTable$Row.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTable$Row.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTableScanner.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTableScanner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTableScanner.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTableScanner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTableScannerTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTableScannerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/HtmlTableScannerTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/HtmlTableScannerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestContext.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestContext.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestContext.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestContext.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestContextImpl.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestContextImpl.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestContextImpl.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestContextImpl.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestSystem$SlimDescriptor.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestSystem$SlimDescriptor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestSystem$SlimDescriptor.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestSystem$SlimDescriptor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestSystem.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestSystem.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestSystem.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestSystemTest$DummyListener.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestSystemTest$DummyListener.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestSystemTest$DummyListener.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestSystemTest$DummyListener.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestSystemTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestSystemTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/SlimTestSystemTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/SlimTestSystemTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/Table$CellContentSubstitution.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/Table$CellContentSubstitution.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/Table$CellContentSubstitution.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/Table$CellContentSubstitution.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/Table.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/Table.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/Table.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/Table.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/TableScanner.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/TableScanner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/TableScanner.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/TableScanner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/TestSystemBaseTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/TestSystemBaseTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/TestSystemBaseTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/TestSystemBaseTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/results/ExceptionResult.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/results/ExceptionResult.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/results/ExceptionResult.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/results/ExceptionResult.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/results/TestResult.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/results/TestResult.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/results/TestResult.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/results/TestResult.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/Assertion.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/Assertion.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/Assertion.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/Assertion.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ComparatorUtil.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ComparatorUtil.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ComparatorUtil.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ComparatorUtil.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ComparatorUtilTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ComparatorUtilTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ComparatorUtilTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ComparatorUtilTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$DecisionTableCaller$ColumnHeaderStore.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$DecisionTableCaller$ColumnHeaderStore.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$DecisionTableCaller$ColumnHeaderStore.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$DecisionTableCaller$ColumnHeaderStore.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$DecisionTableCaller.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$DecisionTableCaller.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$DecisionTableCaller.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$DecisionTableCaller.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$FixtureCaller.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$FixtureCaller.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$FixtureCaller.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$FixtureCaller.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$ScenarioCaller.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$ScenarioCaller.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable$ScenarioCaller.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable$ScenarioCaller.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/DecisionTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/DecisionTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/Expectation$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/Expectation$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/Expectation$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/Expectation$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/Expectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/Expectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/Expectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/Expectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ImportTable$ImportExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ImportTable$ImportExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ImportTable$ImportExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ImportTable$ImportExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ImportTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ImportTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ImportTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ImportTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ImportTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ImportTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ImportTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ImportTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/LibraryTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/LibraryTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/LibraryTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/LibraryTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/LibraryTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/LibraryTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/LibraryTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/LibraryTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/OrderedQueryTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/OrderedQueryTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/OrderedQueryTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/OrderedQueryTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/OrderedQueryTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/OrderedQueryTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/OrderedQueryTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/OrderedQueryTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$QueryResults$QueryMatcher$FieldMatcher.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$QueryResults$QueryMatcher$FieldMatcher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$QueryResults$QueryMatcher$FieldMatcher.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$QueryResults$QueryMatcher$FieldMatcher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$QueryResults$QueryMatcher.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$QueryResults$QueryMatcher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$QueryResults$QueryMatcher.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$QueryResults$QueryMatcher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$QueryResults.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$QueryResults.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$QueryResults.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$QueryResults.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$QueryTableExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$QueryTableExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable$QueryTableExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable$QueryTableExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTableBaseTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTableBaseTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTableBaseTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTableBaseTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/QueryTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/QueryTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ReturnedValueExpectationTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ReturnedValueExpectationTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ReturnedValueExpectationTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ReturnedValueExpectationTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioAndDecisionTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioAndDecisionTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioAndDecisionTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioAndDecisionTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioAndScriptTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioAndScriptTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioAndScriptTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioAndScriptTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTable$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTable$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTable$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTable$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTable$ScenarioExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTable$ScenarioExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTable$ScenarioExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTable$ScenarioExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTable$ScenarioTestContext.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTable$ScenarioTestContext.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTable$ScenarioTestContext.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTable$ScenarioTestContext.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScenarioTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScenarioTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$1.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$1.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ArgumentExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ArgumentExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ArgumentExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ArgumentExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ArgumentExtractor.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ArgumentExtractor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ArgumentExtractor.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ArgumentExtractor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$EnsureActionExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$EnsureActionExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$EnsureActionExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$EnsureActionExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$RejectActionExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$RejectActionExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$RejectActionExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$RejectActionExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ScenarioTableLengthComparator.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ScenarioTableLengthComparator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ScenarioTableLengthComparator.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ScenarioTableLengthComparator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ScriptActionExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ScriptActionExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ScriptActionExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ScriptActionExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ShowActionExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ShowActionExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable$ShowActionExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable$ShowActionExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/ScriptTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/ScriptTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimErrorTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimErrorTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimErrorTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimErrorTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$Comparator.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$Comparator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$Comparator.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$Comparator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$ConstructionExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$ConstructionExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$ConstructionExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$ConstructionExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$Disgracer.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$Disgracer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$Disgracer.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$Disgracer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$FullExpansionSymbolReplacer.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$FullExpansionSymbolReplacer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$FullExpansionSymbolReplacer.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$FullExpansionSymbolReplacer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$RejectedValueExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$RejectedValueExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$RejectedValueExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$RejectedValueExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$ReturnedValueExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$ReturnedValueExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$ReturnedValueExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$ReturnedValueExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$RowExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$RowExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$RowExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$RowExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$SilentReturnExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$SilentReturnExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$SilentReturnExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$SilentReturnExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$SymbolAssignmentExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$SymbolAssignmentExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$SymbolAssignmentExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$SymbolAssignmentExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$SymbolReplacer.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$SymbolReplacer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$SymbolReplacer.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$SymbolReplacer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$VoidReturnExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$VoidReturnExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable$VoidReturnExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable$VoidReturnExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableFactory.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableFactory.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableFactory.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableFactory.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableFactoryTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableFactoryTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableFactoryTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableFactoryTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableTest$MockTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableTest$MockTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableTest$MockTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableTest$MockTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableTestSupport.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableTestSupport.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SlimTableTestSupport.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SlimTableTestSupport.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SubsetQueryTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SubsetQueryTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SubsetQueryTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SubsetQueryTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SubsetQueryTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SubsetQueryTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SubsetQueryTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SubsetQueryTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SyntaxError.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SyntaxError.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/SyntaxError.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/SyntaxError.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/TableTable$TableTableExpectation.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/TableTable$TableTableExpectation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/TableTable$TableTableExpectation.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/TableTable$TableTableExpectation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/TableTable.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/TableTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/TableTable.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/TableTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/TableTableTest.class b/src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/TableTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testsystems/slim/tables/TableTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/testsystems/slim/tables/TableTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/CartesianVector.class b/src/test/resources/fitnesse-target/fitnesse/testutil/CartesianVector.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/CartesianVector.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/CartesianVector.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/CartesianVectorTest.class b/src/test/resources/fitnesse-target/fitnesse/testutil/CartesianVectorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/CartesianVectorTest.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/CartesianVectorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/ClassNotFoundThrownInConstructor.class b/src/test/resources/fitnesse-target/fitnesse/testutil/ClassNotFoundThrownInConstructor.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/ClassNotFoundThrownInConstructor.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/ClassNotFoundThrownInConstructor.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/ClassTranslatePoint.class b/src/test/resources/fitnesse-target/fitnesse/testutil/ClassTranslatePoint.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/ClassTranslatePoint.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/ClassTranslatePoint.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/CrashFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/CrashFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/CrashFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/CrashFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/CreateFileAndWaitFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/CreateFileAndWaitFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/CreateFileAndWaitFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/CreateFileAndWaitFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/DummyClassForWizardTests.class b/src/test/resources/fitnesse-target/fitnesse/testutil/DummyClassForWizardTests.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/DummyClassForWizardTests.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/DummyClassForWizardTests.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/Echo.class b/src/test/resources/fitnesse-target/fitnesse/testutil/Echo.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/Echo.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/Echo.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/EchoFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/EchoFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/EchoFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/EchoFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/ErrorFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/ErrorFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/ErrorFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/ErrorFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/ErrorWritingFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/ErrorWritingFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/ErrorWritingFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/ErrorWritingFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/FailFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/FailFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/FailFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/FailFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/FitNesseUtil.class b/src/test/resources/fitnesse-target/fitnesse/testutil/FitNesseUtil.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/FitNesseUtil.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/FitNesseUtil.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/IgnoreFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/IgnoreFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/IgnoreFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/IgnoreFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/ObjectDelegatePointParser.class b/src/test/resources/fitnesse-target/fitnesse/testutil/ObjectDelegatePointParser.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/ObjectDelegatePointParser.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/ObjectDelegatePointParser.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/ObjectTranslatePoint.class b/src/test/resources/fitnesse-target/fitnesse/testutil/ObjectTranslatePoint.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/ObjectTranslatePoint.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/ObjectTranslatePoint.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/OutputWritingFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/OutputWritingFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/OutputWritingFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/OutputWritingFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/PassFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/PassFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/PassFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/PassFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/SampleFileUtility.class b/src/test/resources/fitnesse-target/fitnesse/testutil/SampleFileUtility.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/SampleFileUtility.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/SampleFileUtility.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/SimpleAuthenticator.class b/src/test/resources/fitnesse-target/fitnesse/testutil/SimpleAuthenticator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/SimpleAuthenticator.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/SimpleAuthenticator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/SimpleCachinePage.class b/src/test/resources/fitnesse-target/fitnesse/testutil/SimpleCachinePage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/SimpleCachinePage.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/SimpleCachinePage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/TestSuiteMaker.class b/src/test/resources/fitnesse-target/fitnesse/testutil/TestSuiteMaker.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/TestSuiteMaker.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/TestSuiteMaker.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/TranslatePoint.class b/src/test/resources/fitnesse-target/fitnesse/testutil/TranslatePoint.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/TranslatePoint.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/TranslatePoint.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/VectorSum.class b/src/test/resources/fitnesse-target/fitnesse/testutil/VectorSum.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/VectorSum.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/VectorSum.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/testutil/WaitFixture.class b/src/test/resources/fitnesse-target/fitnesse/testutil/WaitFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/testutil/WaitFixture.class rename to src/test/resources/fitnesse-target/fitnesse/testutil/WaitFixture.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/tools/LicenseAdder.class b/src/test/resources/fitnesse-target/fitnesse/tools/LicenseAdder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/tools/LicenseAdder.class rename to src/test/resources/fitnesse-target/fitnesse/tools/LicenseAdder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/tools/LicenseManager.class b/src/test/resources/fitnesse-target/fitnesse/tools/LicenseManager.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/tools/LicenseManager.class rename to src/test/resources/fitnesse-target/fitnesse/tools/LicenseManager.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/tools/LicenseManagerTest.class b/src/test/resources/fitnesse-target/fitnesse/tools/LicenseManagerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/tools/LicenseManagerTest.class rename to src/test/resources/fitnesse-target/fitnesse/tools/LicenseManagerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/tools/LicenseRemover.class b/src/test/resources/fitnesse-target/fitnesse/tools/LicenseRemover.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/tools/LicenseRemover.class rename to src/test/resources/fitnesse-target/fitnesse/tools/LicenseRemover.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/FileUpdate.class b/src/test/resources/fitnesse-target/fitnesse/updates/FileUpdate.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/FileUpdate.class rename to src/test/resources/fitnesse-target/fitnesse/updates/FileUpdate.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/FileUpdateTest.class b/src/test/resources/fitnesse-target/fitnesse/updates/FileUpdateTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/FileUpdateTest.class rename to src/test/resources/fitnesse-target/fitnesse/updates/FileUpdateTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/ReplacingFileUpdate.class b/src/test/resources/fitnesse-target/fitnesse/updates/ReplacingFileUpdate.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/ReplacingFileUpdate.class rename to src/test/resources/fitnesse-target/fitnesse/updates/ReplacingFileUpdate.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/ReplacingFileUpdateTest.class b/src/test/resources/fitnesse-target/fitnesse/updates/ReplacingFileUpdateTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/ReplacingFileUpdateTest.class rename to src/test/resources/fitnesse-target/fitnesse/updates/ReplacingFileUpdateTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/Update.class b/src/test/resources/fitnesse-target/fitnesse/updates/Update.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/Update.class rename to src/test/resources/fitnesse-target/fitnesse/updates/Update.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdateFileList.class b/src/test/resources/fitnesse-target/fitnesse/updates/UpdateFileList.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdateFileList.class rename to src/test/resources/fitnesse-target/fitnesse/updates/UpdateFileList.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdateFileListTest.class b/src/test/resources/fitnesse-target/fitnesse/updates/UpdateFileListTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdateFileListTest.class rename to src/test/resources/fitnesse-target/fitnesse/updates/UpdateFileListTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdateTestCase.class b/src/test/resources/fitnesse-target/fitnesse/updates/UpdateTestCase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdateTestCase.class rename to src/test/resources/fitnesse-target/fitnesse/updates/UpdateTestCase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterBase.class b/src/test/resources/fitnesse-target/fitnesse/updates/UpdaterBase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterBase.class rename to src/test/resources/fitnesse-target/fitnesse/updates/UpdaterBase.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterImplementation.class b/src/test/resources/fitnesse-target/fitnesse/updates/UpdaterImplementation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterImplementation.class rename to src/test/resources/fitnesse-target/fitnesse/updates/UpdaterImplementation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterImplementationTest$1.class b/src/test/resources/fitnesse-target/fitnesse/updates/UpdaterImplementationTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterImplementationTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/updates/UpdaterImplementationTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterImplementationTest$UpdateSpy.class b/src/test/resources/fitnesse-target/fitnesse/updates/UpdaterImplementationTest$UpdateSpy.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterImplementationTest$UpdateSpy.class rename to src/test/resources/fitnesse-target/fitnesse/updates/UpdaterImplementationTest$UpdateSpy.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterImplementationTest.class b/src/test/resources/fitnesse-target/fitnesse/updates/UpdaterImplementationTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterImplementationTest.class rename to src/test/resources/fitnesse-target/fitnesse/updates/UpdaterImplementationTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterTest.class b/src/test/resources/fitnesse-target/fitnesse/updates/UpdaterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/updates/UpdaterTest.class rename to src/test/resources/fitnesse-target/fitnesse/updates/UpdaterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/util/Base64.class b/src/test/resources/fitnesse-target/fitnesse/util/Base64.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/util/Base64.class rename to src/test/resources/fitnesse-target/fitnesse/util/Base64.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/util/Base64Test.class b/src/test/resources/fitnesse-target/fitnesse/util/Base64Test.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/util/Base64Test.class rename to src/test/resources/fitnesse-target/fitnesse/util/Base64Test.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/util/HtmlParserTools.class b/src/test/resources/fitnesse-target/fitnesse/util/HtmlParserTools.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/util/HtmlParserTools.class rename to src/test/resources/fitnesse-target/fitnesse/util/HtmlParserTools.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/util/HtmlParserToolsTest.class b/src/test/resources/fitnesse-target/fitnesse/util/HtmlParserToolsTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/util/HtmlParserToolsTest.class rename to src/test/resources/fitnesse-target/fitnesse/util/HtmlParserToolsTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/util/MockSocket.class b/src/test/resources/fitnesse-target/fitnesse/util/MockSocket.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/util/MockSocket.class rename to src/test/resources/fitnesse-target/fitnesse/util/MockSocket.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/BaseWikiPage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/BaseWikiPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/BaseWikiPage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/BaseWikiPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/BaseWikiPageTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/BaseWikiPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/BaseWikiPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/BaseWikiPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/CachingPage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/CachingPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/CachingPage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/CachingPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/CachingPageTest$MemoryEater.class b/src/test/resources/fitnesse-target/fitnesse/wiki/CachingPageTest$MemoryEater.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/CachingPageTest$MemoryEater.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/CachingPageTest$MemoryEater.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/CachingPageTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/CachingPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/CachingPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/CachingPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/CommitingPage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/CommitingPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/CommitingPage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/CommitingPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/ExternalSuitePage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/ExternalSuitePage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/ExternalSuitePage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/ExternalSuitePage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/ExternalSuitePageTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/ExternalSuitePageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/ExternalSuitePageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/ExternalSuitePageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/ExternalTestPage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/ExternalTestPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/ExternalTestPage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/ExternalTestPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/ExternalTestPageTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/ExternalTestPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/ExternalTestPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/ExternalTestPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/FileSystemPage$CmSystem.class b/src/test/resources/fitnesse-target/fitnesse/wiki/FileSystemPage$CmSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/FileSystemPage$CmSystem.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/FileSystemPage$CmSystem.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/FileSystemPage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/FileSystemPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/FileSystemPage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/FileSystemPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/FileSystemPageTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/FileSystemPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/FileSystemPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/FileSystemPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/FileSystemPageZipFileVersioningTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/FileSystemPageZipFileVersioningTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/FileSystemPageZipFileVersioningTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/FileSystemPageZipFileVersioningTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/InMemoryPage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/InMemoryPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/InMemoryPage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/InMemoryPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/InMemoryPageTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/InMemoryPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/InMemoryPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/InMemoryPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/InheritedItemBuilder.class b/src/test/resources/fitnesse-target/fitnesse/wiki/InheritedItemBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/InheritedItemBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/InheritedItemBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/MockXmlizerPageHandler.class b/src/test/resources/fitnesse-target/fitnesse/wiki/MockXmlizerPageHandler.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/MockXmlizerPageHandler.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/MockXmlizerPageHandler.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/MockingPageCrawler.class b/src/test/resources/fitnesse-target/fitnesse/wiki/MockingPageCrawler.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/MockingPageCrawler.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/MockingPageCrawler.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/MockingPageCrawlerTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/MockingPageCrawlerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/MockingPageCrawlerTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/MockingPageCrawlerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/NoSuchVersionException.class b/src/test/resources/fitnesse-target/fitnesse/wiki/NoSuchVersionException.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/NoSuchVersionException.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/NoSuchVersionException.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/NullVersionsController.class b/src/test/resources/fitnesse-target/fitnesse/wiki/NullVersionsController.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/NullVersionsController.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/NullVersionsController.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageCrawler.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageCrawler.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageCrawler.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageCrawler.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageCrawlerDeadEndStrategy.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageCrawlerDeadEndStrategy.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageCrawlerDeadEndStrategy.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageCrawlerDeadEndStrategy.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageCrawlerImpl.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageCrawlerImpl.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageCrawlerImpl.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageCrawlerImpl.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageCrawlerTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageCrawlerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageCrawlerTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageCrawlerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageData$1.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageData$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageData$1.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageData$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageData.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageData.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageData.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageData.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageDataTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageDataTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageDataTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageDataTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PagePointer.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PagePointer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PagePointer.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PagePointer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageRepository.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageRepository.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageRepository.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageRepository.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageRepositoryTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageRepositoryTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageRepositoryTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageRepositoryTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageType$1.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageType$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageType$1.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageType$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageType$2.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageType$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageType$2.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageType$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageType$3.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageType$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageType$3.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageType$3.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageType.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageType.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageType.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageType.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageTypeTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageTypeTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageTypeTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageTypeTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageVersionPruner.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageVersionPruner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageVersionPruner.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageVersionPruner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageXmlizer.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageXmlizer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageXmlizer.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageXmlizer.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageXmlizerTest$1.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageXmlizerTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageXmlizerTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageXmlizerTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageXmlizerTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PageXmlizerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PageXmlizerTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PageXmlizerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PathParser.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PathParser.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PathParser.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PathParser.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/PathParserTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/PathParserTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/PathParserTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/PathParserTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/ProxyPage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/ProxyPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/ProxyPage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/ProxyPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/ProxyPageTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/ProxyPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/ProxyPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/ProxyPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/ReadOnlyPageData.class b/src/test/resources/fitnesse-target/fitnesse/wiki/ReadOnlyPageData.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/ReadOnlyPageData.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/ReadOnlyPageData.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/SymbolicPage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/SymbolicPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/SymbolicPage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/SymbolicPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/SymbolicPageTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/SymbolicPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/SymbolicPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/SymbolicPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/VersionInfo.class b/src/test/resources/fitnesse-target/fitnesse/wiki/VersionInfo.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/VersionInfo.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/VersionInfo.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/VersionInfoTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/VersionInfoTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/VersionInfoTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/VersionInfoTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/VersionsController.class b/src/test/resources/fitnesse-target/fitnesse/wiki/VersionsController.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/VersionsController.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/VersionsController.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiImportProperty.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiImportProperty.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiImportProperty.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiImportProperty.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiImportPropertyTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiImportPropertyTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiImportPropertyTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiImportPropertyTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPage.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPage.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageActions.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageActions.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageActions.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageActions.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageDummy.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageDummy.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageDummy.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageDummy.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePath$Mode.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePath$Mode.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePath$Mode.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePath$Mode.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePath.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePath.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePath.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePath.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePathTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePathTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePathTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePathTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageProperties.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageProperties.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageProperties.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageProperties.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePropertiesTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePropertiesTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePropertiesTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePropertiesTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageProperty.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageProperty.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageProperty.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageProperty.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePropertyTest.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePropertyTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPagePropertyTest.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPagePropertyTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageUtil.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageUtil.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiPageUtil.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiPageUtil.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiWordReference.class b/src/test/resources/fitnesse-target/fitnesse/wiki/WikiWordReference.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/WikiWordReference.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/WikiWordReference.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/XmlizePageCondition.class b/src/test/resources/fitnesse-target/fitnesse/wiki/XmlizePageCondition.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/XmlizePageCondition.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/XmlizePageCondition.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/XmlizerPageHandler.class b/src/test/resources/fitnesse-target/fitnesse/wiki/XmlizerPageHandler.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/XmlizerPageHandler.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/XmlizerPageHandler.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/cmSystems/GitCmSystem.class b/src/test/resources/fitnesse-target/fitnesse/wiki/cmSystems/GitCmSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/cmSystems/GitCmSystem.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/cmSystems/GitCmSystem.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wiki/zip/ZipFileVersionsController.class b/src/test/resources/fitnesse-target/fitnesse/wiki/zip/ZipFileVersionsController.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wiki/zip/ZipFileVersionsController.class rename to src/test/resources/fitnesse-target/fitnesse/wiki/zip/ZipFileVersionsController.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/PerformanceTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/PerformanceTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/PerformanceTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/PerformanceTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/Utils.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/Utils.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/Utils.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/Utils.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/UtilsTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/UtilsTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/UtilsTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/UtilsTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Alias.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Alias.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Alias.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Alias.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/AnchorName.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/AnchorName.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/AnchorName.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/AnchorName.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/AnchorReference.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/AnchorReference.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/AnchorReference.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/AnchorReference.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Collapsible.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Collapsible.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Collapsible.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Collapsible.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Comment.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Comment.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Comment.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Comment.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Contents.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Contents.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Contents.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Contents.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ContentsItemBuilder.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ContentsItemBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ContentsItemBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ContentsItemBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Define.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Define.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Define.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Define.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/EqualPairRule.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/EqualPairRule.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/EqualPairRule.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/EqualPairRule.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Evaluator.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Evaluator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Evaluator.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Evaluator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HashTable.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HashTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HashTable.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HashTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HeaderLine.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HeaderLine.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HeaderLine.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HeaderLine.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Help.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Help.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Help.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Help.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HorizontalRule.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HorizontalRule.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HorizontalRule.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HorizontalRule.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$2.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$2.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$3.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$3.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$3.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$4.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$4.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$4.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$4.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$TagBuilder.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$TagBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder$TagBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder$TagBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlTranslator.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlTranslator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlTranslator.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlTranslator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlWriter$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlWriter$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlWriter$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlWriter$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlWriter$Tag.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlWriter$Tag.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlWriter$Tag.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlWriter$Tag.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlWriter$Tags.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlWriter$Tags.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlWriter$Tags.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlWriter$Tags.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlWriter.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlWriter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/HtmlWriter.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/HtmlWriter.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Image.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Image.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Image.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Image.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Include.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Include.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Include.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Include.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/LastModified.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/LastModified.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/LastModified.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/LastModified.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/LineRule.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/LineRule.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/LineRule.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/LineRule.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Link$Reference.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Link$Reference.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Link$Reference.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Link$Reference.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Link.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Link.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Link.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Link.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ListBuilder.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ListBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ListBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ListBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ListRule.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ListRule.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ListRule.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ListRule.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Literal.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Literal.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Literal.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Literal.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matchable.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matchable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matchable.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matchable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$2.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$2.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$3.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$3.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$3.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$4.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$4.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$4.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$4.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$5.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$5.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$5.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$5.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$6.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$6.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$6.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$6.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$7.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$7.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$7.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$7.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$8.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$8.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$8.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$8.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$9.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$9.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$9.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$9.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$ScanMatch.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$ScanMatch.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher$ScanMatch.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher$ScanMatch.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Matcher.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Matcher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Nesting.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Nesting.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Nesting.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Nesting.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ParseSpecification$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ParseSpecification$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ParseSpecification$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ParseSpecification$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ParseSpecification.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ParseSpecification.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ParseSpecification.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ParseSpecification.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ParsedPage.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ParsedPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ParsedPage.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ParsedPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Parser.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Parser.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Parser.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Parser.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ParsingPage.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ParsingPage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ParsingPage.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ParsingPage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Path.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Path.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Path.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Path.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Paths$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Paths$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Paths$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Paths$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Paths$TreeWalker.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Paths$TreeWalker.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Paths$TreeWalker.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Paths$TreeWalker.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Paths.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Paths.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Paths.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Paths.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/PathsProvider.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/PathsProvider.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/PathsProvider.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/PathsProvider.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/PlainTextTable.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/PlainTextTable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/PlainTextTable.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/PlainTextTable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Preformat.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Preformat.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Preformat.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Preformat.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Rule.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Rule.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Rule.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Rule.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ScanString.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ScanString.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/ScanString.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/ScanString.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Scanner$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Scanner$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Scanner$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Scanner$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Scanner$Step.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Scanner$Step.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Scanner$Step.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Scanner$Step.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Scanner.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Scanner.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Scanner.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Scanner.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/See.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/See.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/See.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/See.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SourcePage.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SourcePage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SourcePage.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SourcePage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/StyleRule.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/StyleRule.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/StyleRule.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/StyleRule.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Symbol.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Symbol.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Symbol.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Symbol.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolMatch.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolMatch.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolMatch.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolMatch.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolMatcher.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolMatcher.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolMatcher.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolMatcher.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolProvider.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolProvider.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolProvider.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolProvider.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolStream.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolStream.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolStream.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolStream.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolTreeWalker.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolTreeWalker.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolTreeWalker.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolTreeWalker.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolType$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolType$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolType$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolType$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolType.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolType.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/SymbolType.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/SymbolType.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Table$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Table$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Table$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Table$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Table.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Table.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Table.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Table.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/TextBuilder.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/TextBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/TextBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/TextBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/TextMaker.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/TextMaker.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/TextMaker.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/TextMaker.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Today.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Today.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Today.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Today.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Translation.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Translation.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Translation.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Translation.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Translator.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Translator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Translator.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Translator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Variable.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Variable.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/Variable.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/Variable.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/VariableFinder.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/VariableFinder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/VariableFinder.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/VariableFinder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/VariableSource.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/VariableSource.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/VariableSource.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/VariableSource.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$2.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$2.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$2.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$3.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$3.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$3.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$4.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$4.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$4.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$4.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$5.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$5.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$5.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$5.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$6.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$6.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$6.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$6.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$WikiStringBuilder.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$WikiStringBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder$WikiStringBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder$WikiStringBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiSourcePage.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiSourcePage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiSourcePage.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiSourcePage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiTranslator.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiTranslator.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiTranslator.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiTranslator.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiWord.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiWord.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiWord.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiWord.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiWordBuilder.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiWordBuilder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiWordBuilder.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiWordBuilder.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiWordPath.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiWordPath.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/parser/WikiWordPath.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/parser/WikiWordPath.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/AliasTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/AliasTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/AliasTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/AliasTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/AnchorNameTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/AnchorNameTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/AnchorNameTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/AnchorNameTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/AnchorReferenceTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/AnchorReferenceTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/AnchorReferenceTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/AnchorReferenceTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/CollapsibleTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/CollapsibleTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/CollapsibleTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/CollapsibleTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/CommentTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/CommentTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/CommentTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/CommentTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ContentsItemTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/ContentsItemTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ContentsItemTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/ContentsItemTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ContentsTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/ContentsTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ContentsTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/ContentsTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/DefineTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/DefineTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/DefineTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/DefineTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/EMailTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/EMailTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/EMailTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/EMailTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/EqualPairTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/EqualPairTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/EqualPairTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/EqualPairTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/EvaluatorTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/EvaluatorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/EvaluatorTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/EvaluatorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/HashTableTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/HashTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/HashTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/HashTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/HelpTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/HelpTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/HelpTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/HelpTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/HorizontalRuleTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/HorizontalRuleTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/HorizontalRuleTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/HorizontalRuleTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/HtmlWriterTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/HtmlWriterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/HtmlWriterTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/HtmlWriterTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ImageTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/ImageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ImageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/ImageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/IncludeTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/IncludeTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/IncludeTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/IncludeTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/LastModifiedTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/LastModifiedTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/LastModifiedTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/LastModifiedTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/LineTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/LineTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/LineTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/LineTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/LinkTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/LinkTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/LinkTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/LinkTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ListTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/ListTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ListTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/ListTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/LiteralTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/LiteralTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/LiteralTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/LiteralTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/NestingTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/NestingTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/NestingTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/NestingTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/NewlineTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/NewlineTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/NewlineTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/NewlineTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ParsedPageTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/ParsedPageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ParsedPageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/ParsedPageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ParserTestHelper.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/ParserTestHelper.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ParserTestHelper.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/ParserTestHelper.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/PathTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/PathTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/PathTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/PathTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/PlainTextTableTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/PlainTextTableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/PlainTextTableTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/PlainTextTableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/PreformatTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/PreformatTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/PreformatTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/PreformatTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ScannerTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/ScannerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/ScannerTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/ScannerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/SeeTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/SeeTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/SeeTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/SeeTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/StyleTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/StyleTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/StyleTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/StyleTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/SymbolProviderTest$1.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/SymbolProviderTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/SymbolProviderTest$1.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/SymbolProviderTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/SymbolProviderTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/SymbolProviderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/SymbolProviderTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/SymbolProviderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TableTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/TableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TableTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/TableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TestRoot.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/TestRoot.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TestRoot.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/TestRoot.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TestSourcePage.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/TestSourcePage.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TestSourcePage.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/TestSourcePage.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TestVariableSource.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/TestVariableSource.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TestVariableSource.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/TestVariableSource.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TextMakerTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/TextMakerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TextMakerTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/TextMakerTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TextTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/TextTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TextTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/TextTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TodayTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/TodayTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/TodayTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/TodayTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/VariableTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/VariableTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/VariableTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/VariableTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/WikiSourcePageTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/WikiSourcePageTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/WikiSourcePageTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/WikiSourcePageTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/WikiTranslatorTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/WikiTranslatorTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/WikiTranslatorTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/WikiTranslatorTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/WikiWordBuilderTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/WikiWordBuilderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/WikiWordBuilderTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/WikiWordBuilderTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/WikiWordTest.class b/src/test/resources/fitnesse-target/fitnesse/wikitext/test/WikiWordTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesse/wikitext/test/WikiWordTest.class rename to src/test/resources/fitnesse-target/fitnesse/wikitext/test/WikiWordTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesseMain/ArgumentsTest.class b/src/test/resources/fitnesse-target/fitnesseMain/ArgumentsTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesseMain/ArgumentsTest.class rename to src/test/resources/fitnesse-target/fitnesseMain/ArgumentsTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesseMain/FitNesseMain.class b/src/test/resources/fitnesse-target/fitnesseMain/FitNesseMain.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesseMain/FitNesseMain.class rename to src/test/resources/fitnesse-target/fitnesseMain/FitNesseMain.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesseMain/FitNesseMainTest.class b/src/test/resources/fitnesse-target/fitnesseMain/FitNesseMainTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesseMain/FitNesseMainTest.class rename to src/test/resources/fitnesse-target/fitnesseMain/FitNesseMainTest.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesseMain/ant/ExecuteFitnesseTestsTask.class b/src/test/resources/fitnesse-target/fitnesseMain/ant/ExecuteFitnesseTestsTask.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesseMain/ant/ExecuteFitnesseTestsTask.class rename to src/test/resources/fitnesse-target/fitnesseMain/ant/ExecuteFitnesseTestsTask.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesseMain/ant/StartFitnesseTask.class b/src/test/resources/fitnesse-target/fitnesseMain/ant/StartFitnesseTask.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesseMain/ant/StartFitnesseTask.class rename to src/test/resources/fitnesse-target/fitnesseMain/ant/StartFitnesseTask.class diff --git a/src/test/resources/fitnesse-target/classes/fitnesseMain/ant/StopFitnesseTask.class b/src/test/resources/fitnesse-target/fitnesseMain/ant/StopFitnesseTask.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/fitnesseMain/ant/StopFitnesseTask.class rename to src/test/resources/fitnesse-target/fitnesseMain/ant/StopFitnesseTask.class diff --git a/src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/Game.class b/src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/Game.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/Game.class rename to src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/Game.class diff --git a/src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/Player.class b/src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/Player.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/Player.class rename to src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/Player.class diff --git a/src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/fitnesseFixtures/AddRemovePlayerFixture.class b/src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/fitnesseFixtures/AddRemovePlayerFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/fitnesseFixtures/AddRemovePlayerFixture.class rename to src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/fitnesseFixtures/AddRemovePlayerFixture.class diff --git a/src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/fitnesseFixtures/GameTurnFixture.class b/src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/fitnesseFixtures/GameTurnFixture.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/fitnesseFixtures/GameTurnFixture.class rename to src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/fitnesseFixtures/GameTurnFixture.class diff --git a/src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/fitnesseFixtures/StaticGame.class b/src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/fitnesseFixtures/StaticGame.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/org/fitnesse/triviaGameExample/fitnesseFixtures/StaticGame.class rename to src/test/resources/fitnesse-target/org/fitnesse/triviaGameExample/fitnesseFixtures/StaticGame.class diff --git a/src/test/resources/fitnesse-target/classes/tasks.properties b/src/test/resources/fitnesse-target/tasks.properties similarity index 100% rename from src/test/resources/fitnesse-target/classes/tasks.properties rename to src/test/resources/fitnesse-target/tasks.properties diff --git a/src/test/resources/fitnesse-target/classes/util/Clock.class b/src/test/resources/fitnesse-target/util/Clock.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/Clock.class rename to src/test/resources/fitnesse-target/util/Clock.class diff --git a/src/test/resources/fitnesse-target/classes/util/ClockTest$1.class b/src/test/resources/fitnesse-target/util/ClockTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/ClockTest$1.class rename to src/test/resources/fitnesse-target/util/ClockTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/util/ClockTest.class b/src/test/resources/fitnesse-target/util/ClockTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/ClockTest.class rename to src/test/resources/fitnesse-target/util/ClockTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/CommandLine.class b/src/test/resources/fitnesse-target/util/CommandLine.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/CommandLine.class rename to src/test/resources/fitnesse-target/util/CommandLine.class diff --git a/src/test/resources/fitnesse-target/classes/util/CommandLineTest.class b/src/test/resources/fitnesse-target/util/CommandLineTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/CommandLineTest.class rename to src/test/resources/fitnesse-target/util/CommandLineTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/DateAlteringClock.class b/src/test/resources/fitnesse-target/util/DateAlteringClock.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/DateAlteringClock.class rename to src/test/resources/fitnesse-target/util/DateAlteringClock.class diff --git a/src/test/resources/fitnesse-target/classes/util/DateAlteringClockTest.class b/src/test/resources/fitnesse-target/util/DateAlteringClockTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/DateAlteringClockTest.class rename to src/test/resources/fitnesse-target/util/DateAlteringClockTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/DateTimeUtil.class b/src/test/resources/fitnesse-target/util/DateTimeUtil.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/DateTimeUtil.class rename to src/test/resources/fitnesse-target/util/DateTimeUtil.class diff --git a/src/test/resources/fitnesse-target/classes/util/DiskFileSystem.class b/src/test/resources/fitnesse-target/util/DiskFileSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/DiskFileSystem.class rename to src/test/resources/fitnesse-target/util/DiskFileSystem.class diff --git a/src/test/resources/fitnesse-target/classes/util/EnvironmentVariableTool.class b/src/test/resources/fitnesse-target/util/EnvironmentVariableTool.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/EnvironmentVariableTool.class rename to src/test/resources/fitnesse-target/util/EnvironmentVariableTool.class diff --git a/src/test/resources/fitnesse-target/classes/util/EnvironmentVariableToolTest.class b/src/test/resources/fitnesse-target/util/EnvironmentVariableToolTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/EnvironmentVariableToolTest.class rename to src/test/resources/fitnesse-target/util/EnvironmentVariableToolTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/Expression.class b/src/test/resources/fitnesse-target/util/Expression.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/Expression.class rename to src/test/resources/fitnesse-target/util/Expression.class diff --git a/src/test/resources/fitnesse-target/classes/util/FileSystem.class b/src/test/resources/fitnesse-target/util/FileSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/FileSystem.class rename to src/test/resources/fitnesse-target/util/FileSystem.class diff --git a/src/test/resources/fitnesse-target/classes/util/FileUtil.class b/src/test/resources/fitnesse-target/util/FileUtil.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/FileUtil.class rename to src/test/resources/fitnesse-target/util/FileUtil.class diff --git a/src/test/resources/fitnesse-target/classes/util/FileUtilTest.class b/src/test/resources/fitnesse-target/util/FileUtilTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/FileUtilTest.class rename to src/test/resources/fitnesse-target/util/FileUtilTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/FormattedExpression.class b/src/test/resources/fitnesse-target/util/FormattedExpression.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/FormattedExpression.class rename to src/test/resources/fitnesse-target/util/FormattedExpression.class diff --git a/src/test/resources/fitnesse-target/classes/util/GracefulNamer$1.class b/src/test/resources/fitnesse-target/util/GracefulNamer$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/GracefulNamer$1.class rename to src/test/resources/fitnesse-target/util/GracefulNamer$1.class diff --git a/src/test/resources/fitnesse-target/classes/util/GracefulNamer$GracefulNameState.class b/src/test/resources/fitnesse-target/util/GracefulNamer$GracefulNameState.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/GracefulNamer$GracefulNameState.class rename to src/test/resources/fitnesse-target/util/GracefulNamer$GracefulNameState.class diff --git a/src/test/resources/fitnesse-target/classes/util/GracefulNamer$InNumberState.class b/src/test/resources/fitnesse-target/util/GracefulNamer$InNumberState.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/GracefulNamer$InNumberState.class rename to src/test/resources/fitnesse-target/util/GracefulNamer$InNumberState.class diff --git a/src/test/resources/fitnesse-target/classes/util/GracefulNamer$InWordState.class b/src/test/resources/fitnesse-target/util/GracefulNamer$InWordState.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/GracefulNamer$InWordState.class rename to src/test/resources/fitnesse-target/util/GracefulNamer$InWordState.class diff --git a/src/test/resources/fitnesse-target/classes/util/GracefulNamer$OutOfWordState.class b/src/test/resources/fitnesse-target/util/GracefulNamer$OutOfWordState.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/GracefulNamer$OutOfWordState.class rename to src/test/resources/fitnesse-target/util/GracefulNamer$OutOfWordState.class diff --git a/src/test/resources/fitnesse-target/classes/util/GracefulNamer.class b/src/test/resources/fitnesse-target/util/GracefulNamer.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/GracefulNamer.class rename to src/test/resources/fitnesse-target/util/GracefulNamer.class diff --git a/src/test/resources/fitnesse-target/classes/util/GracefulNamerTest.class b/src/test/resources/fitnesse-target/util/GracefulNamerTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/GracefulNamerTest.class rename to src/test/resources/fitnesse-target/util/GracefulNamerTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/ListUtility.class b/src/test/resources/fitnesse-target/util/ListUtility.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/ListUtility.class rename to src/test/resources/fitnesse-target/util/ListUtility.class diff --git a/src/test/resources/fitnesse-target/classes/util/Maybe.class b/src/test/resources/fitnesse-target/util/Maybe.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/Maybe.class rename to src/test/resources/fitnesse-target/util/Maybe.class diff --git a/src/test/resources/fitnesse-target/classes/util/MemoryFileSystem.class b/src/test/resources/fitnesse-target/util/MemoryFileSystem.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/MemoryFileSystem.class rename to src/test/resources/fitnesse-target/util/MemoryFileSystem.class diff --git a/src/test/resources/fitnesse-target/classes/util/Option.class b/src/test/resources/fitnesse-target/util/Option.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/Option.class rename to src/test/resources/fitnesse-target/util/Option.class diff --git a/src/test/resources/fitnesse-target/classes/util/RegexTestCase.class b/src/test/resources/fitnesse-target/util/RegexTestCase.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/RegexTestCase.class rename to src/test/resources/fitnesse-target/util/RegexTestCase.class diff --git a/src/test/resources/fitnesse-target/classes/util/StandardOutAndErrorRecorder.class b/src/test/resources/fitnesse-target/util/StandardOutAndErrorRecorder.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StandardOutAndErrorRecorder.class rename to src/test/resources/fitnesse-target/util/StandardOutAndErrorRecorder.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReader$1.class b/src/test/resources/fitnesse-target/util/StreamReader$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReader$1.class rename to src/test/resources/fitnesse-target/util/StreamReader$1.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReader$2.class b/src/test/resources/fitnesse-target/util/StreamReader$2.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReader$2.class rename to src/test/resources/fitnesse-target/util/StreamReader$2.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReader$3.class b/src/test/resources/fitnesse-target/util/StreamReader$3.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReader$3.class rename to src/test/resources/fitnesse-target/util/StreamReader$3.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReader$4.class b/src/test/resources/fitnesse-target/util/StreamReader$4.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReader$4.class rename to src/test/resources/fitnesse-target/util/StreamReader$4.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReader$State.class b/src/test/resources/fitnesse-target/util/StreamReader$State.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReader$State.class rename to src/test/resources/fitnesse-target/util/StreamReader$State.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReader.class b/src/test/resources/fitnesse-target/util/StreamReader.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReader.class rename to src/test/resources/fitnesse-target/util/StreamReader.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadCount.class b/src/test/resources/fitnesse-target/util/StreamReaderTest$ReadCount.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadCount.class rename to src/test/resources/fitnesse-target/util/StreamReaderTest$ReadCount.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadCountBytes.class b/src/test/resources/fitnesse-target/util/StreamReaderTest$ReadCountBytes.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadCountBytes.class rename to src/test/resources/fitnesse-target/util/StreamReaderTest$ReadCountBytes.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadLine.class b/src/test/resources/fitnesse-target/util/StreamReaderTest$ReadLine.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadLine.class rename to src/test/resources/fitnesse-target/util/StreamReaderTest$ReadLine.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadLineBytes.class b/src/test/resources/fitnesse-target/util/StreamReaderTest$ReadLineBytes.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadLineBytes.class rename to src/test/resources/fitnesse-target/util/StreamReaderTest$ReadLineBytes.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadThread.class b/src/test/resources/fitnesse-target/util/StreamReaderTest$ReadThread.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadThread.class rename to src/test/resources/fitnesse-target/util/StreamReaderTest$ReadThread.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadUpTo.class b/src/test/resources/fitnesse-target/util/StreamReaderTest$ReadUpTo.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadUpTo.class rename to src/test/resources/fitnesse-target/util/StreamReaderTest$ReadUpTo.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadUpToBytes.class b/src/test/resources/fitnesse-target/util/StreamReaderTest$ReadUpToBytes.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReaderTest$ReadUpToBytes.class rename to src/test/resources/fitnesse-target/util/StreamReaderTest$ReadUpToBytes.class diff --git a/src/test/resources/fitnesse-target/classes/util/StreamReaderTest.class b/src/test/resources/fitnesse-target/util/StreamReaderTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StreamReaderTest.class rename to src/test/resources/fitnesse-target/util/StreamReaderTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/StringUtil.class b/src/test/resources/fitnesse-target/util/StringUtil.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StringUtil.class rename to src/test/resources/fitnesse-target/util/StringUtil.class diff --git a/src/test/resources/fitnesse-target/classes/util/StringUtilTest.class b/src/test/resources/fitnesse-target/util/StringUtilTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/StringUtilTest.class rename to src/test/resources/fitnesse-target/util/StringUtilTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/SystemClock.class b/src/test/resources/fitnesse-target/util/SystemClock.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/SystemClock.class rename to src/test/resources/fitnesse-target/util/SystemClock.class diff --git a/src/test/resources/fitnesse-target/classes/util/SystemTimeKeeper.class b/src/test/resources/fitnesse-target/util/SystemTimeKeeper.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/SystemTimeKeeper.class rename to src/test/resources/fitnesse-target/util/SystemTimeKeeper.class diff --git a/src/test/resources/fitnesse-target/classes/util/TemplateUtil.class b/src/test/resources/fitnesse-target/util/TemplateUtil.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/TemplateUtil.class rename to src/test/resources/fitnesse-target/util/TemplateUtil.class diff --git a/src/test/resources/fitnesse-target/classes/util/TemplateUtilTest.class b/src/test/resources/fitnesse-target/util/TemplateUtilTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/TemplateUtilTest.class rename to src/test/resources/fitnesse-target/util/TemplateUtilTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/TestClock.class b/src/test/resources/fitnesse-target/util/TestClock.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/TestClock.class rename to src/test/resources/fitnesse-target/util/TestClock.class diff --git a/src/test/resources/fitnesse-target/classes/util/TestTimeKeeper.class b/src/test/resources/fitnesse-target/util/TestTimeKeeper.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/TestTimeKeeper.class rename to src/test/resources/fitnesse-target/util/TestTimeKeeper.class diff --git a/src/test/resources/fitnesse-target/classes/util/TimeKeeper.class b/src/test/resources/fitnesse-target/util/TimeKeeper.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/TimeKeeper.class rename to src/test/resources/fitnesse-target/util/TimeKeeper.class diff --git a/src/test/resources/fitnesse-target/classes/util/TimeMeasurement.class b/src/test/resources/fitnesse-target/util/TimeMeasurement.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/TimeMeasurement.class rename to src/test/resources/fitnesse-target/util/TimeMeasurement.class diff --git a/src/test/resources/fitnesse-target/classes/util/TimeMeasurementTest$1.class b/src/test/resources/fitnesse-target/util/TimeMeasurementTest$1.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/TimeMeasurementTest$1.class rename to src/test/resources/fitnesse-target/util/TimeMeasurementTest$1.class diff --git a/src/test/resources/fitnesse-target/classes/util/TimeMeasurementTest.class b/src/test/resources/fitnesse-target/util/TimeMeasurementTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/TimeMeasurementTest.class rename to src/test/resources/fitnesse-target/util/TimeMeasurementTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/Wildcard.class b/src/test/resources/fitnesse-target/util/Wildcard.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/Wildcard.class rename to src/test/resources/fitnesse-target/util/Wildcard.class diff --git a/src/test/resources/fitnesse-target/classes/util/WildcardTest.class b/src/test/resources/fitnesse-target/util/WildcardTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/WildcardTest.class rename to src/test/resources/fitnesse-target/util/WildcardTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/XmlUtil.class b/src/test/resources/fitnesse-target/util/XmlUtil.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/XmlUtil.class rename to src/test/resources/fitnesse-target/util/XmlUtil.class diff --git a/src/test/resources/fitnesse-target/classes/util/XmlUtilTest.class b/src/test/resources/fitnesse-target/util/XmlUtilTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/XmlUtilTest.class rename to src/test/resources/fitnesse-target/util/XmlUtilTest.class diff --git a/src/test/resources/fitnesse-target/classes/util/XmlWriter.class b/src/test/resources/fitnesse-target/util/XmlWriter.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/XmlWriter.class rename to src/test/resources/fitnesse-target/util/XmlWriter.class diff --git a/src/test/resources/fitnesse-target/classes/util/XmlWriterTest.class b/src/test/resources/fitnesse-target/util/XmlWriterTest.class similarity index 100% rename from src/test/resources/fitnesse-target/classes/util/XmlWriterTest.class rename to src/test/resources/fitnesse-target/util/XmlWriterTest.class diff --git a/src/test/resources/junit-target/classes/junit/extensions/ActiveTestSuite$1.class b/src/test/resources/junit-target/junit/extensions/ActiveTestSuite$1.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/extensions/ActiveTestSuite$1.class rename to src/test/resources/junit-target/junit/extensions/ActiveTestSuite$1.class diff --git a/src/test/resources/junit-target/classes/junit/extensions/ActiveTestSuite.class b/src/test/resources/junit-target/junit/extensions/ActiveTestSuite.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/extensions/ActiveTestSuite.class rename to src/test/resources/junit-target/junit/extensions/ActiveTestSuite.class diff --git a/src/test/resources/junit-target/classes/junit/extensions/RepeatedTest.class b/src/test/resources/junit-target/junit/extensions/RepeatedTest.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/extensions/RepeatedTest.class rename to src/test/resources/junit-target/junit/extensions/RepeatedTest.class diff --git a/src/test/resources/junit-target/classes/junit/extensions/TestDecorator.class b/src/test/resources/junit-target/junit/extensions/TestDecorator.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/extensions/TestDecorator.class rename to src/test/resources/junit-target/junit/extensions/TestDecorator.class diff --git a/src/test/resources/junit-target/classes/junit/extensions/TestSetup$1.class b/src/test/resources/junit-target/junit/extensions/TestSetup$1.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/extensions/TestSetup$1.class rename to src/test/resources/junit-target/junit/extensions/TestSetup$1.class diff --git a/src/test/resources/junit-target/classes/junit/extensions/TestSetup.class b/src/test/resources/junit-target/junit/extensions/TestSetup.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/extensions/TestSetup.class rename to src/test/resources/junit-target/junit/extensions/TestSetup.class diff --git a/src/test/resources/junit-target/classes/junit/framework/Assert.class b/src/test/resources/junit-target/junit/framework/Assert.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/Assert.class rename to src/test/resources/junit-target/junit/framework/Assert.class diff --git a/src/test/resources/junit-target/classes/junit/framework/AssertionFailedError.class b/src/test/resources/junit-target/junit/framework/AssertionFailedError.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/AssertionFailedError.class rename to src/test/resources/junit-target/junit/framework/AssertionFailedError.class diff --git a/src/test/resources/junit-target/classes/junit/framework/ComparisonCompactor.class b/src/test/resources/junit-target/junit/framework/ComparisonCompactor.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/ComparisonCompactor.class rename to src/test/resources/junit-target/junit/framework/ComparisonCompactor.class diff --git a/src/test/resources/junit-target/classes/junit/framework/ComparisonFailure.class b/src/test/resources/junit-target/junit/framework/ComparisonFailure.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/ComparisonFailure.class rename to src/test/resources/junit-target/junit/framework/ComparisonFailure.class diff --git a/src/test/resources/junit-target/classes/junit/framework/JUnit4TestAdapter.class b/src/test/resources/junit-target/junit/framework/JUnit4TestAdapter.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/JUnit4TestAdapter.class rename to src/test/resources/junit-target/junit/framework/JUnit4TestAdapter.class diff --git a/src/test/resources/junit-target/classes/junit/framework/JUnit4TestAdapterCache$1.class b/src/test/resources/junit-target/junit/framework/JUnit4TestAdapterCache$1.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/JUnit4TestAdapterCache$1.class rename to src/test/resources/junit-target/junit/framework/JUnit4TestAdapterCache$1.class diff --git a/src/test/resources/junit-target/classes/junit/framework/JUnit4TestAdapterCache.class b/src/test/resources/junit-target/junit/framework/JUnit4TestAdapterCache.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/JUnit4TestAdapterCache.class rename to src/test/resources/junit-target/junit/framework/JUnit4TestAdapterCache.class diff --git a/src/test/resources/junit-target/classes/junit/framework/JUnit4TestCaseFacade.class b/src/test/resources/junit-target/junit/framework/JUnit4TestCaseFacade.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/JUnit4TestCaseFacade.class rename to src/test/resources/junit-target/junit/framework/JUnit4TestCaseFacade.class diff --git a/src/test/resources/junit-target/classes/junit/framework/Protectable.class b/src/test/resources/junit-target/junit/framework/Protectable.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/Protectable.class rename to src/test/resources/junit-target/junit/framework/Protectable.class diff --git a/src/test/resources/junit-target/classes/junit/framework/Test.class b/src/test/resources/junit-target/junit/framework/Test.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/Test.class rename to src/test/resources/junit-target/junit/framework/Test.class diff --git a/src/test/resources/junit-target/classes/junit/framework/TestCase.class b/src/test/resources/junit-target/junit/framework/TestCase.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/TestCase.class rename to src/test/resources/junit-target/junit/framework/TestCase.class diff --git a/src/test/resources/junit-target/classes/junit/framework/TestFailure.class b/src/test/resources/junit-target/junit/framework/TestFailure.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/TestFailure.class rename to src/test/resources/junit-target/junit/framework/TestFailure.class diff --git a/src/test/resources/junit-target/classes/junit/framework/TestListener.class b/src/test/resources/junit-target/junit/framework/TestListener.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/TestListener.class rename to src/test/resources/junit-target/junit/framework/TestListener.class diff --git a/src/test/resources/junit-target/classes/junit/framework/TestResult$1.class b/src/test/resources/junit-target/junit/framework/TestResult$1.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/TestResult$1.class rename to src/test/resources/junit-target/junit/framework/TestResult$1.class diff --git a/src/test/resources/junit-target/classes/junit/framework/TestResult.class b/src/test/resources/junit-target/junit/framework/TestResult.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/TestResult.class rename to src/test/resources/junit-target/junit/framework/TestResult.class diff --git a/src/test/resources/junit-target/classes/junit/framework/TestSuite$1.class b/src/test/resources/junit-target/junit/framework/TestSuite$1.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/TestSuite$1.class rename to src/test/resources/junit-target/junit/framework/TestSuite$1.class diff --git a/src/test/resources/junit-target/classes/junit/framework/TestSuite.class b/src/test/resources/junit-target/junit/framework/TestSuite.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/framework/TestSuite.class rename to src/test/resources/junit-target/junit/framework/TestSuite.class diff --git a/src/test/resources/junit-target/classes/junit/runner/BaseTestRunner.class b/src/test/resources/junit-target/junit/runner/BaseTestRunner.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/runner/BaseTestRunner.class rename to src/test/resources/junit-target/junit/runner/BaseTestRunner.class diff --git a/src/test/resources/junit-target/classes/junit/runner/TestRunListener.class b/src/test/resources/junit-target/junit/runner/TestRunListener.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/runner/TestRunListener.class rename to src/test/resources/junit-target/junit/runner/TestRunListener.class diff --git a/src/test/resources/junit-target/classes/junit/runner/Version.class b/src/test/resources/junit-target/junit/runner/Version.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/runner/Version.class rename to src/test/resources/junit-target/junit/runner/Version.class diff --git a/src/test/resources/junit-target/classes/junit/runner/logo.gif b/src/test/resources/junit-target/junit/runner/logo.gif similarity index 100% rename from src/test/resources/junit-target/classes/junit/runner/logo.gif rename to src/test/resources/junit-target/junit/runner/logo.gif diff --git a/src/test/resources/junit-target/classes/junit/runner/smalllogo.gif b/src/test/resources/junit-target/junit/runner/smalllogo.gif similarity index 100% rename from src/test/resources/junit-target/classes/junit/runner/smalllogo.gif rename to src/test/resources/junit-target/junit/runner/smalllogo.gif diff --git a/src/test/resources/junit-target/classes/junit/textui/ResultPrinter.class b/src/test/resources/junit-target/junit/textui/ResultPrinter.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/textui/ResultPrinter.class rename to src/test/resources/junit-target/junit/textui/ResultPrinter.class diff --git a/src/test/resources/junit-target/classes/junit/textui/TestRunner.class b/src/test/resources/junit-target/junit/textui/TestRunner.class similarity index 100% rename from src/test/resources/junit-target/classes/junit/textui/TestRunner.class rename to src/test/resources/junit-target/junit/textui/TestRunner.class diff --git a/src/test/resources/junit-target/classes/org/junit/After.class b/src/test/resources/junit-target/org/junit/After.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/After.class rename to src/test/resources/junit-target/org/junit/After.class diff --git a/src/test/resources/junit-target/classes/org/junit/AfterClass.class b/src/test/resources/junit-target/org/junit/AfterClass.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/AfterClass.class rename to src/test/resources/junit-target/org/junit/AfterClass.class diff --git a/src/test/resources/junit-target/classes/org/junit/Assert.class b/src/test/resources/junit-target/org/junit/Assert.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/Assert.class rename to src/test/resources/junit-target/org/junit/Assert.class diff --git a/src/test/resources/junit-target/classes/org/junit/Assume.class b/src/test/resources/junit-target/org/junit/Assume.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/Assume.class rename to src/test/resources/junit-target/org/junit/Assume.class diff --git a/src/test/resources/junit-target/classes/org/junit/Before.class b/src/test/resources/junit-target/org/junit/Before.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/Before.class rename to src/test/resources/junit-target/org/junit/Before.class diff --git a/src/test/resources/junit-target/classes/org/junit/BeforeClass.class b/src/test/resources/junit-target/org/junit/BeforeClass.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/BeforeClass.class rename to src/test/resources/junit-target/org/junit/BeforeClass.class diff --git a/src/test/resources/junit-target/classes/org/junit/ClassRule.class b/src/test/resources/junit-target/org/junit/ClassRule.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/ClassRule.class rename to src/test/resources/junit-target/org/junit/ClassRule.class diff --git a/src/test/resources/junit-target/classes/org/junit/ComparisonFailure$ComparisonCompactor.class b/src/test/resources/junit-target/org/junit/ComparisonFailure$ComparisonCompactor.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/ComparisonFailure$ComparisonCompactor.class rename to src/test/resources/junit-target/org/junit/ComparisonFailure$ComparisonCompactor.class diff --git a/src/test/resources/junit-target/classes/org/junit/ComparisonFailure.class b/src/test/resources/junit-target/org/junit/ComparisonFailure.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/ComparisonFailure.class rename to src/test/resources/junit-target/org/junit/ComparisonFailure.class diff --git a/src/test/resources/junit-target/classes/org/junit/FixMethodOrder.class b/src/test/resources/junit-target/org/junit/FixMethodOrder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/FixMethodOrder.class rename to src/test/resources/junit-target/org/junit/FixMethodOrder.class diff --git a/src/test/resources/junit-target/classes/org/junit/Ignore.class b/src/test/resources/junit-target/org/junit/Ignore.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/Ignore.class rename to src/test/resources/junit-target/org/junit/Ignore.class diff --git a/src/test/resources/junit-target/classes/org/junit/Rule.class b/src/test/resources/junit-target/org/junit/Rule.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/Rule.class rename to src/test/resources/junit-target/org/junit/Rule.class diff --git a/src/test/resources/junit-target/classes/org/junit/Test$None.class b/src/test/resources/junit-target/org/junit/Test$None.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/Test$None.class rename to src/test/resources/junit-target/org/junit/Test$None.class diff --git a/src/test/resources/junit-target/classes/org/junit/Test.class b/src/test/resources/junit-target/org/junit/Test.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/Test.class rename to src/test/resources/junit-target/org/junit/Test.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/ParallelComputer$1.class b/src/test/resources/junit-target/org/junit/experimental/ParallelComputer$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/ParallelComputer$1.class rename to src/test/resources/junit-target/org/junit/experimental/ParallelComputer$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/ParallelComputer.class b/src/test/resources/junit-target/org/junit/experimental/ParallelComputer.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/ParallelComputer.class rename to src/test/resources/junit-target/org/junit/experimental/ParallelComputer.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/categories/Categories$CategoryFilter.class b/src/test/resources/junit-target/org/junit/experimental/categories/Categories$CategoryFilter.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/categories/Categories$CategoryFilter.class rename to src/test/resources/junit-target/org/junit/experimental/categories/Categories$CategoryFilter.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/categories/Categories$ExcludeCategory.class b/src/test/resources/junit-target/org/junit/experimental/categories/Categories$ExcludeCategory.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/categories/Categories$ExcludeCategory.class rename to src/test/resources/junit-target/org/junit/experimental/categories/Categories$ExcludeCategory.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/categories/Categories$IncludeCategory.class b/src/test/resources/junit-target/org/junit/experimental/categories/Categories$IncludeCategory.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/categories/Categories$IncludeCategory.class rename to src/test/resources/junit-target/org/junit/experimental/categories/Categories$IncludeCategory.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/categories/Categories.class b/src/test/resources/junit-target/org/junit/experimental/categories/Categories.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/categories/Categories.class rename to src/test/resources/junit-target/org/junit/experimental/categories/Categories.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/categories/Category.class b/src/test/resources/junit-target/org/junit/experimental/categories/Category.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/categories/Category.class rename to src/test/resources/junit-target/org/junit/experimental/categories/Category.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/max/CouldNotReadCoreException.class b/src/test/resources/junit-target/org/junit/experimental/max/CouldNotReadCoreException.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/max/CouldNotReadCoreException.class rename to src/test/resources/junit-target/org/junit/experimental/max/CouldNotReadCoreException.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/max/MaxCore$1$1.class b/src/test/resources/junit-target/org/junit/experimental/max/MaxCore$1$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/max/MaxCore$1$1.class rename to src/test/resources/junit-target/org/junit/experimental/max/MaxCore$1$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/max/MaxCore$1.class b/src/test/resources/junit-target/org/junit/experimental/max/MaxCore$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/max/MaxCore$1.class rename to src/test/resources/junit-target/org/junit/experimental/max/MaxCore$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/max/MaxCore.class b/src/test/resources/junit-target/org/junit/experimental/max/MaxCore.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/max/MaxCore.class rename to src/test/resources/junit-target/org/junit/experimental/max/MaxCore.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/max/MaxHistory$1.class b/src/test/resources/junit-target/org/junit/experimental/max/MaxHistory$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/max/MaxHistory$1.class rename to src/test/resources/junit-target/org/junit/experimental/max/MaxHistory$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/max/MaxHistory$RememberingListener.class b/src/test/resources/junit-target/org/junit/experimental/max/MaxHistory$RememberingListener.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/max/MaxHistory$RememberingListener.class rename to src/test/resources/junit-target/org/junit/experimental/max/MaxHistory$RememberingListener.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/max/MaxHistory$TestComparator.class b/src/test/resources/junit-target/org/junit/experimental/max/MaxHistory$TestComparator.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/max/MaxHistory$TestComparator.class rename to src/test/resources/junit-target/org/junit/experimental/max/MaxHistory$TestComparator.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/max/MaxHistory.class b/src/test/resources/junit-target/org/junit/experimental/max/MaxHistory.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/max/MaxHistory.class rename to src/test/resources/junit-target/org/junit/experimental/max/MaxHistory.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/results/FailureList.class b/src/test/resources/junit-target/org/junit/experimental/results/FailureList.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/results/FailureList.class rename to src/test/resources/junit-target/org/junit/experimental/results/FailureList.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/results/PrintableResult.class b/src/test/resources/junit-target/org/junit/experimental/results/PrintableResult.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/results/PrintableResult.class rename to src/test/resources/junit-target/org/junit/experimental/results/PrintableResult.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/results/ResultMatchers$1.class b/src/test/resources/junit-target/org/junit/experimental/results/ResultMatchers$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/results/ResultMatchers$1.class rename to src/test/resources/junit-target/org/junit/experimental/results/ResultMatchers$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/results/ResultMatchers$2.class b/src/test/resources/junit-target/org/junit/experimental/results/ResultMatchers$2.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/results/ResultMatchers$2.class rename to src/test/resources/junit-target/org/junit/experimental/results/ResultMatchers$2.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/results/ResultMatchers$3.class b/src/test/resources/junit-target/org/junit/experimental/results/ResultMatchers$3.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/results/ResultMatchers$3.class rename to src/test/resources/junit-target/org/junit/experimental/results/ResultMatchers$3.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/results/ResultMatchers.class b/src/test/resources/junit-target/org/junit/experimental/results/ResultMatchers.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/results/ResultMatchers.class rename to src/test/resources/junit-target/org/junit/experimental/results/ResultMatchers.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/runners/Enclosed.class b/src/test/resources/junit-target/org/junit/experimental/runners/Enclosed.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/runners/Enclosed.class rename to src/test/resources/junit-target/org/junit/experimental/runners/Enclosed.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/DataPoint.class b/src/test/resources/junit-target/org/junit/experimental/theories/DataPoint.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/DataPoint.class rename to src/test/resources/junit-target/org/junit/experimental/theories/DataPoint.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/DataPoints.class b/src/test/resources/junit-target/org/junit/experimental/theories/DataPoints.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/DataPoints.class rename to src/test/resources/junit-target/org/junit/experimental/theories/DataPoints.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/FromDataPoints.class b/src/test/resources/junit-target/org/junit/experimental/theories/FromDataPoints.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/FromDataPoints.class rename to src/test/resources/junit-target/org/junit/experimental/theories/FromDataPoints.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/ParameterSignature.class b/src/test/resources/junit-target/org/junit/experimental/theories/ParameterSignature.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/ParameterSignature.class rename to src/test/resources/junit-target/org/junit/experimental/theories/ParameterSignature.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/ParameterSupplier.class b/src/test/resources/junit-target/org/junit/experimental/theories/ParameterSupplier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/ParameterSupplier.class rename to src/test/resources/junit-target/org/junit/experimental/theories/ParameterSupplier.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/ParametersSuppliedBy.class b/src/test/resources/junit-target/org/junit/experimental/theories/ParametersSuppliedBy.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/ParametersSuppliedBy.class rename to src/test/resources/junit-target/org/junit/experimental/theories/ParametersSuppliedBy.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/PotentialAssignment$1.class b/src/test/resources/junit-target/org/junit/experimental/theories/PotentialAssignment$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/PotentialAssignment$1.class rename to src/test/resources/junit-target/org/junit/experimental/theories/PotentialAssignment$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/PotentialAssignment$CouldNotGenerateValueException.class b/src/test/resources/junit-target/org/junit/experimental/theories/PotentialAssignment$CouldNotGenerateValueException.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/PotentialAssignment$CouldNotGenerateValueException.class rename to src/test/resources/junit-target/org/junit/experimental/theories/PotentialAssignment$CouldNotGenerateValueException.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/PotentialAssignment.class b/src/test/resources/junit-target/org/junit/experimental/theories/PotentialAssignment.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/PotentialAssignment.class rename to src/test/resources/junit-target/org/junit/experimental/theories/PotentialAssignment.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories$TheoryAnchor$1$1.class b/src/test/resources/junit-target/org/junit/experimental/theories/Theories$TheoryAnchor$1$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories$TheoryAnchor$1$1.class rename to src/test/resources/junit-target/org/junit/experimental/theories/Theories$TheoryAnchor$1$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories$TheoryAnchor$1.class b/src/test/resources/junit-target/org/junit/experimental/theories/Theories$TheoryAnchor$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories$TheoryAnchor$1.class rename to src/test/resources/junit-target/org/junit/experimental/theories/Theories$TheoryAnchor$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories$TheoryAnchor$2.class b/src/test/resources/junit-target/org/junit/experimental/theories/Theories$TheoryAnchor$2.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories$TheoryAnchor$2.class rename to src/test/resources/junit-target/org/junit/experimental/theories/Theories$TheoryAnchor$2.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories$TheoryAnchor.class b/src/test/resources/junit-target/org/junit/experimental/theories/Theories$TheoryAnchor.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories$TheoryAnchor.class rename to src/test/resources/junit-target/org/junit/experimental/theories/Theories$TheoryAnchor.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories.class b/src/test/resources/junit-target/org/junit/experimental/theories/Theories.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/Theories.class rename to src/test/resources/junit-target/org/junit/experimental/theories/Theories.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/Theory.class b/src/test/resources/junit-target/org/junit/experimental/theories/Theory.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/Theory.class rename to src/test/resources/junit-target/org/junit/experimental/theories/Theory.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/AllMembersSupplier$1.class b/src/test/resources/junit-target/org/junit/experimental/theories/internal/AllMembersSupplier$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/AllMembersSupplier$1.class rename to src/test/resources/junit-target/org/junit/experimental/theories/internal/AllMembersSupplier$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/AllMembersSupplier$MethodParameterValue.class b/src/test/resources/junit-target/org/junit/experimental/theories/internal/AllMembersSupplier$MethodParameterValue.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/AllMembersSupplier$MethodParameterValue.class rename to src/test/resources/junit-target/org/junit/experimental/theories/internal/AllMembersSupplier$MethodParameterValue.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/AllMembersSupplier.class b/src/test/resources/junit-target/org/junit/experimental/theories/internal/AllMembersSupplier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/AllMembersSupplier.class rename to src/test/resources/junit-target/org/junit/experimental/theories/internal/AllMembersSupplier.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/Assignments.class b/src/test/resources/junit-target/org/junit/experimental/theories/internal/Assignments.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/Assignments.class rename to src/test/resources/junit-target/org/junit/experimental/theories/internal/Assignments.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/BooleanSupplier.class b/src/test/resources/junit-target/org/junit/experimental/theories/internal/BooleanSupplier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/BooleanSupplier.class rename to src/test/resources/junit-target/org/junit/experimental/theories/internal/BooleanSupplier.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/EnumSupplier.class b/src/test/resources/junit-target/org/junit/experimental/theories/internal/EnumSupplier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/EnumSupplier.class rename to src/test/resources/junit-target/org/junit/experimental/theories/internal/EnumSupplier.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/ParameterizedAssertionError.class b/src/test/resources/junit-target/org/junit/experimental/theories/internal/ParameterizedAssertionError.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/ParameterizedAssertionError.class rename to src/test/resources/junit-target/org/junit/experimental/theories/internal/ParameterizedAssertionError.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/SpecificDataPointsSupplier.class b/src/test/resources/junit-target/org/junit/experimental/theories/internal/SpecificDataPointsSupplier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/internal/SpecificDataPointsSupplier.class rename to src/test/resources/junit-target/org/junit/experimental/theories/internal/SpecificDataPointsSupplier.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/suppliers/TestedOn.class b/src/test/resources/junit-target/org/junit/experimental/theories/suppliers/TestedOn.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/suppliers/TestedOn.class rename to src/test/resources/junit-target/org/junit/experimental/theories/suppliers/TestedOn.class diff --git a/src/test/resources/junit-target/classes/org/junit/experimental/theories/suppliers/TestedOnSupplier.class b/src/test/resources/junit-target/org/junit/experimental/theories/suppliers/TestedOnSupplier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/experimental/theories/suppliers/TestedOnSupplier.class rename to src/test/resources/junit-target/org/junit/experimental/theories/suppliers/TestedOnSupplier.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/ArrayComparisonFailure.class b/src/test/resources/junit-target/org/junit/internal/ArrayComparisonFailure.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/ArrayComparisonFailure.class rename to src/test/resources/junit-target/org/junit/internal/ArrayComparisonFailure.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/AssumptionViolatedException.class b/src/test/resources/junit-target/org/junit/internal/AssumptionViolatedException.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/AssumptionViolatedException.class rename to src/test/resources/junit-target/org/junit/internal/AssumptionViolatedException.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/ComparisonCriteria.class b/src/test/resources/junit-target/org/junit/internal/ComparisonCriteria.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/ComparisonCriteria.class rename to src/test/resources/junit-target/org/junit/internal/ComparisonCriteria.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/ExactComparisonCriteria.class b/src/test/resources/junit-target/org/junit/internal/ExactComparisonCriteria.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/ExactComparisonCriteria.class rename to src/test/resources/junit-target/org/junit/internal/ExactComparisonCriteria.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/InexactComparisonCriteria.class b/src/test/resources/junit-target/org/junit/internal/InexactComparisonCriteria.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/InexactComparisonCriteria.class rename to src/test/resources/junit-target/org/junit/internal/InexactComparisonCriteria.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/JUnitSystem.class b/src/test/resources/junit-target/org/junit/internal/JUnitSystem.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/JUnitSystem.class rename to src/test/resources/junit-target/org/junit/internal/JUnitSystem.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/MethodSorter$1.class b/src/test/resources/junit-target/org/junit/internal/MethodSorter$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/MethodSorter$1.class rename to src/test/resources/junit-target/org/junit/internal/MethodSorter$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/MethodSorter$2.class b/src/test/resources/junit-target/org/junit/internal/MethodSorter$2.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/MethodSorter$2.class rename to src/test/resources/junit-target/org/junit/internal/MethodSorter$2.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/MethodSorter.class b/src/test/resources/junit-target/org/junit/internal/MethodSorter.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/MethodSorter.class rename to src/test/resources/junit-target/org/junit/internal/MethodSorter.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/RealSystem.class b/src/test/resources/junit-target/org/junit/internal/RealSystem.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/RealSystem.class rename to src/test/resources/junit-target/org/junit/internal/RealSystem.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/TextListener.class b/src/test/resources/junit-target/org/junit/internal/TextListener.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/TextListener.class rename to src/test/resources/junit-target/org/junit/internal/TextListener.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.class b/src/test/resources/junit-target/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.class rename to src/test/resources/junit-target/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/builders/AnnotatedBuilder.class b/src/test/resources/junit-target/org/junit/internal/builders/AnnotatedBuilder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/builders/AnnotatedBuilder.class rename to src/test/resources/junit-target/org/junit/internal/builders/AnnotatedBuilder.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/builders/IgnoredBuilder.class b/src/test/resources/junit-target/org/junit/internal/builders/IgnoredBuilder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/builders/IgnoredBuilder.class rename to src/test/resources/junit-target/org/junit/internal/builders/IgnoredBuilder.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/builders/IgnoredClassRunner.class b/src/test/resources/junit-target/org/junit/internal/builders/IgnoredClassRunner.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/builders/IgnoredClassRunner.class rename to src/test/resources/junit-target/org/junit/internal/builders/IgnoredClassRunner.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/builders/JUnit3Builder.class b/src/test/resources/junit-target/org/junit/internal/builders/JUnit3Builder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/builders/JUnit3Builder.class rename to src/test/resources/junit-target/org/junit/internal/builders/JUnit3Builder.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/builders/JUnit4Builder.class b/src/test/resources/junit-target/org/junit/internal/builders/JUnit4Builder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/builders/JUnit4Builder.class rename to src/test/resources/junit-target/org/junit/internal/builders/JUnit4Builder.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/builders/NullBuilder.class b/src/test/resources/junit-target/org/junit/internal/builders/NullBuilder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/builders/NullBuilder.class rename to src/test/resources/junit-target/org/junit/internal/builders/NullBuilder.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/builders/SuiteMethodBuilder.class b/src/test/resources/junit-target/org/junit/internal/builders/SuiteMethodBuilder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/builders/SuiteMethodBuilder.class rename to src/test/resources/junit-target/org/junit/internal/builders/SuiteMethodBuilder.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/matchers/StacktracePrintingMatcher.class b/src/test/resources/junit-target/org/junit/internal/matchers/StacktracePrintingMatcher.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/matchers/StacktracePrintingMatcher.class rename to src/test/resources/junit-target/org/junit/internal/matchers/StacktracePrintingMatcher.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/matchers/ThrowableCauseMatcher.class b/src/test/resources/junit-target/org/junit/internal/matchers/ThrowableCauseMatcher.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/matchers/ThrowableCauseMatcher.class rename to src/test/resources/junit-target/org/junit/internal/matchers/ThrowableCauseMatcher.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/matchers/ThrowableMessageMatcher.class b/src/test/resources/junit-target/org/junit/internal/matchers/ThrowableMessageMatcher.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/matchers/ThrowableMessageMatcher.class rename to src/test/resources/junit-target/org/junit/internal/matchers/ThrowableMessageMatcher.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/matchers/TypeSafeMatcher.class b/src/test/resources/junit-target/org/junit/internal/matchers/TypeSafeMatcher.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/matchers/TypeSafeMatcher.class rename to src/test/resources/junit-target/org/junit/internal/matchers/TypeSafeMatcher.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/requests/ClassRequest.class b/src/test/resources/junit-target/org/junit/internal/requests/ClassRequest.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/requests/ClassRequest.class rename to src/test/resources/junit-target/org/junit/internal/requests/ClassRequest.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/requests/FilterRequest.class b/src/test/resources/junit-target/org/junit/internal/requests/FilterRequest.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/requests/FilterRequest.class rename to src/test/resources/junit-target/org/junit/internal/requests/FilterRequest.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/requests/SortingRequest.class b/src/test/resources/junit-target/org/junit/internal/requests/SortingRequest.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/requests/SortingRequest.class rename to src/test/resources/junit-target/org/junit/internal/requests/SortingRequest.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/ClassRoadie.class b/src/test/resources/junit-target/org/junit/internal/runners/ClassRoadie.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/ClassRoadie.class rename to src/test/resources/junit-target/org/junit/internal/runners/ClassRoadie.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/ErrorReportingRunner.class b/src/test/resources/junit-target/org/junit/internal/runners/ErrorReportingRunner.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/ErrorReportingRunner.class rename to src/test/resources/junit-target/org/junit/internal/runners/ErrorReportingRunner.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/FailedBefore.class b/src/test/resources/junit-target/org/junit/internal/runners/FailedBefore.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/FailedBefore.class rename to src/test/resources/junit-target/org/junit/internal/runners/FailedBefore.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/InitializationError.class b/src/test/resources/junit-target/org/junit/internal/runners/InitializationError.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/InitializationError.class rename to src/test/resources/junit-target/org/junit/internal/runners/InitializationError.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit38ClassRunner$1.class b/src/test/resources/junit-target/org/junit/internal/runners/JUnit38ClassRunner$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit38ClassRunner$1.class rename to src/test/resources/junit-target/org/junit/internal/runners/JUnit38ClassRunner$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit38ClassRunner$OldTestClassAdaptingListener.class b/src/test/resources/junit-target/org/junit/internal/runners/JUnit38ClassRunner$OldTestClassAdaptingListener.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit38ClassRunner$OldTestClassAdaptingListener.class rename to src/test/resources/junit-target/org/junit/internal/runners/JUnit38ClassRunner$OldTestClassAdaptingListener.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit38ClassRunner.class b/src/test/resources/junit-target/org/junit/internal/runners/JUnit38ClassRunner.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit38ClassRunner.class rename to src/test/resources/junit-target/org/junit/internal/runners/JUnit38ClassRunner.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit4ClassRunner$1.class b/src/test/resources/junit-target/org/junit/internal/runners/JUnit4ClassRunner$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit4ClassRunner$1.class rename to src/test/resources/junit-target/org/junit/internal/runners/JUnit4ClassRunner$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit4ClassRunner$2.class b/src/test/resources/junit-target/org/junit/internal/runners/JUnit4ClassRunner$2.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit4ClassRunner$2.class rename to src/test/resources/junit-target/org/junit/internal/runners/JUnit4ClassRunner$2.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit4ClassRunner.class b/src/test/resources/junit-target/org/junit/internal/runners/JUnit4ClassRunner.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/JUnit4ClassRunner.class rename to src/test/resources/junit-target/org/junit/internal/runners/JUnit4ClassRunner.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/MethodRoadie$1$1.class b/src/test/resources/junit-target/org/junit/internal/runners/MethodRoadie$1$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/MethodRoadie$1$1.class rename to src/test/resources/junit-target/org/junit/internal/runners/MethodRoadie$1$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/MethodRoadie$1.class b/src/test/resources/junit-target/org/junit/internal/runners/MethodRoadie$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/MethodRoadie$1.class rename to src/test/resources/junit-target/org/junit/internal/runners/MethodRoadie$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/MethodRoadie$2.class b/src/test/resources/junit-target/org/junit/internal/runners/MethodRoadie$2.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/MethodRoadie$2.class rename to src/test/resources/junit-target/org/junit/internal/runners/MethodRoadie$2.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/MethodRoadie.class b/src/test/resources/junit-target/org/junit/internal/runners/MethodRoadie.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/MethodRoadie.class rename to src/test/resources/junit-target/org/junit/internal/runners/MethodRoadie.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/MethodValidator.class b/src/test/resources/junit-target/org/junit/internal/runners/MethodValidator.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/MethodValidator.class rename to src/test/resources/junit-target/org/junit/internal/runners/MethodValidator.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/SuiteMethod.class b/src/test/resources/junit-target/org/junit/internal/runners/SuiteMethod.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/SuiteMethod.class rename to src/test/resources/junit-target/org/junit/internal/runners/SuiteMethod.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/TestClass.class b/src/test/resources/junit-target/org/junit/internal/runners/TestClass.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/TestClass.class rename to src/test/resources/junit-target/org/junit/internal/runners/TestClass.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/TestMethod.class b/src/test/resources/junit-target/org/junit/internal/runners/TestMethod.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/TestMethod.class rename to src/test/resources/junit-target/org/junit/internal/runners/TestMethod.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/model/EachTestNotifier.class b/src/test/resources/junit-target/org/junit/internal/runners/model/EachTestNotifier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/model/EachTestNotifier.class rename to src/test/resources/junit-target/org/junit/internal/runners/model/EachTestNotifier.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/model/MultipleFailureException.class b/src/test/resources/junit-target/org/junit/internal/runners/model/MultipleFailureException.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/model/MultipleFailureException.class rename to src/test/resources/junit-target/org/junit/internal/runners/model/MultipleFailureException.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/model/ReflectiveCallable.class b/src/test/resources/junit-target/org/junit/internal/runners/model/ReflectiveCallable.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/model/ReflectiveCallable.class rename to src/test/resources/junit-target/org/junit/internal/runners/model/ReflectiveCallable.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/rules/RuleFieldValidator.class b/src/test/resources/junit-target/org/junit/internal/runners/rules/RuleFieldValidator.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/rules/RuleFieldValidator.class rename to src/test/resources/junit-target/org/junit/internal/runners/rules/RuleFieldValidator.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/statements/ExpectException.class b/src/test/resources/junit-target/org/junit/internal/runners/statements/ExpectException.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/statements/ExpectException.class rename to src/test/resources/junit-target/org/junit/internal/runners/statements/ExpectException.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/statements/Fail.class b/src/test/resources/junit-target/org/junit/internal/runners/statements/Fail.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/statements/Fail.class rename to src/test/resources/junit-target/org/junit/internal/runners/statements/Fail.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/statements/FailOnTimeout$1.class b/src/test/resources/junit-target/org/junit/internal/runners/statements/FailOnTimeout$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/statements/FailOnTimeout$1.class rename to src/test/resources/junit-target/org/junit/internal/runners/statements/FailOnTimeout$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/statements/FailOnTimeout$CallableStatement.class b/src/test/resources/junit-target/org/junit/internal/runners/statements/FailOnTimeout$CallableStatement.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/statements/FailOnTimeout$CallableStatement.class rename to src/test/resources/junit-target/org/junit/internal/runners/statements/FailOnTimeout$CallableStatement.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/statements/FailOnTimeout.class b/src/test/resources/junit-target/org/junit/internal/runners/statements/FailOnTimeout.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/statements/FailOnTimeout.class rename to src/test/resources/junit-target/org/junit/internal/runners/statements/FailOnTimeout.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/statements/InvokeMethod.class b/src/test/resources/junit-target/org/junit/internal/runners/statements/InvokeMethod.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/statements/InvokeMethod.class rename to src/test/resources/junit-target/org/junit/internal/runners/statements/InvokeMethod.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/statements/RunAfters.class b/src/test/resources/junit-target/org/junit/internal/runners/statements/RunAfters.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/statements/RunAfters.class rename to src/test/resources/junit-target/org/junit/internal/runners/statements/RunAfters.class diff --git a/src/test/resources/junit-target/classes/org/junit/internal/runners/statements/RunBefores.class b/src/test/resources/junit-target/org/junit/internal/runners/statements/RunBefores.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/internal/runners/statements/RunBefores.class rename to src/test/resources/junit-target/org/junit/internal/runners/statements/RunBefores.class diff --git a/src/test/resources/junit-target/classes/org/junit/matchers/JUnitMatchers.class b/src/test/resources/junit-target/org/junit/matchers/JUnitMatchers.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/matchers/JUnitMatchers.class rename to src/test/resources/junit-target/org/junit/matchers/JUnitMatchers.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/ErrorCollector$1.class b/src/test/resources/junit-target/org/junit/rules/ErrorCollector$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/ErrorCollector$1.class rename to src/test/resources/junit-target/org/junit/rules/ErrorCollector$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/ErrorCollector.class b/src/test/resources/junit-target/org/junit/rules/ErrorCollector.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/ErrorCollector.class rename to src/test/resources/junit-target/org/junit/rules/ErrorCollector.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/ExpectedException$ExpectedExceptionStatement.class b/src/test/resources/junit-target/org/junit/rules/ExpectedException$ExpectedExceptionStatement.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/ExpectedException$ExpectedExceptionStatement.class rename to src/test/resources/junit-target/org/junit/rules/ExpectedException$ExpectedExceptionStatement.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/ExpectedException.class b/src/test/resources/junit-target/org/junit/rules/ExpectedException.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/ExpectedException.class rename to src/test/resources/junit-target/org/junit/rules/ExpectedException.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/ExpectedExceptionMatcherBuilder.class b/src/test/resources/junit-target/org/junit/rules/ExpectedExceptionMatcherBuilder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/ExpectedExceptionMatcherBuilder.class rename to src/test/resources/junit-target/org/junit/rules/ExpectedExceptionMatcherBuilder.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/ExternalResource$1.class b/src/test/resources/junit-target/org/junit/rules/ExternalResource$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/ExternalResource$1.class rename to src/test/resources/junit-target/org/junit/rules/ExternalResource$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/ExternalResource.class b/src/test/resources/junit-target/org/junit/rules/ExternalResource.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/ExternalResource.class rename to src/test/resources/junit-target/org/junit/rules/ExternalResource.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/MethodRule.class b/src/test/resources/junit-target/org/junit/rules/MethodRule.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/MethodRule.class rename to src/test/resources/junit-target/org/junit/rules/MethodRule.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/RuleChain.class b/src/test/resources/junit-target/org/junit/rules/RuleChain.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/RuleChain.class rename to src/test/resources/junit-target/org/junit/rules/RuleChain.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/RunRules.class b/src/test/resources/junit-target/org/junit/rules/RunRules.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/RunRules.class rename to src/test/resources/junit-target/org/junit/rules/RunRules.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/Stopwatch.class b/src/test/resources/junit-target/org/junit/rules/Stopwatch.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/Stopwatch.class rename to src/test/resources/junit-target/org/junit/rules/Stopwatch.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/TemporaryFolder.class b/src/test/resources/junit-target/org/junit/rules/TemporaryFolder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/TemporaryFolder.class rename to src/test/resources/junit-target/org/junit/rules/TemporaryFolder.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/TestName.class b/src/test/resources/junit-target/org/junit/rules/TestName.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/TestName.class rename to src/test/resources/junit-target/org/junit/rules/TestName.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/TestRule.class b/src/test/resources/junit-target/org/junit/rules/TestRule.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/TestRule.class rename to src/test/resources/junit-target/org/junit/rules/TestRule.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/TestWatcher$1.class b/src/test/resources/junit-target/org/junit/rules/TestWatcher$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/TestWatcher$1.class rename to src/test/resources/junit-target/org/junit/rules/TestWatcher$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/TestWatcher.class b/src/test/resources/junit-target/org/junit/rules/TestWatcher.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/TestWatcher.class rename to src/test/resources/junit-target/org/junit/rules/TestWatcher.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/TestWatchman$1.class b/src/test/resources/junit-target/org/junit/rules/TestWatchman$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/TestWatchman$1.class rename to src/test/resources/junit-target/org/junit/rules/TestWatchman$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/TestWatchman.class b/src/test/resources/junit-target/org/junit/rules/TestWatchman.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/TestWatchman.class rename to src/test/resources/junit-target/org/junit/rules/TestWatchman.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/Timeout.class b/src/test/resources/junit-target/org/junit/rules/Timeout.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/Timeout.class rename to src/test/resources/junit-target/org/junit/rules/Timeout.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/Verifier$1.class b/src/test/resources/junit-target/org/junit/rules/Verifier$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/Verifier$1.class rename to src/test/resources/junit-target/org/junit/rules/Verifier$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/rules/Verifier.class b/src/test/resources/junit-target/org/junit/rules/Verifier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/rules/Verifier.class rename to src/test/resources/junit-target/org/junit/rules/Verifier.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Computer$1.class b/src/test/resources/junit-target/org/junit/runner/Computer$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Computer$1.class rename to src/test/resources/junit-target/org/junit/runner/Computer$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Computer.class b/src/test/resources/junit-target/org/junit/runner/Computer.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Computer.class rename to src/test/resources/junit-target/org/junit/runner/Computer.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Describable.class b/src/test/resources/junit-target/org/junit/runner/Describable.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Describable.class rename to src/test/resources/junit-target/org/junit/runner/Describable.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Description.class b/src/test/resources/junit-target/org/junit/runner/Description.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Description.class rename to src/test/resources/junit-target/org/junit/runner/Description.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/JUnitCore.class b/src/test/resources/junit-target/org/junit/runner/JUnitCore.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/JUnitCore.class rename to src/test/resources/junit-target/org/junit/runner/JUnitCore.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Request$1.class b/src/test/resources/junit-target/org/junit/runner/Request$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Request$1.class rename to src/test/resources/junit-target/org/junit/runner/Request$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Request.class b/src/test/resources/junit-target/org/junit/runner/Request.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Request.class rename to src/test/resources/junit-target/org/junit/runner/Request.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Result$1.class b/src/test/resources/junit-target/org/junit/runner/Result$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Result$1.class rename to src/test/resources/junit-target/org/junit/runner/Result$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Result$Listener.class b/src/test/resources/junit-target/org/junit/runner/Result$Listener.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Result$Listener.class rename to src/test/resources/junit-target/org/junit/runner/Result$Listener.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Result.class b/src/test/resources/junit-target/org/junit/runner/Result.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Result.class rename to src/test/resources/junit-target/org/junit/runner/Result.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/RunWith.class b/src/test/resources/junit-target/org/junit/runner/RunWith.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/RunWith.class rename to src/test/resources/junit-target/org/junit/runner/RunWith.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/Runner.class b/src/test/resources/junit-target/org/junit/runner/Runner.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/Runner.class rename to src/test/resources/junit-target/org/junit/runner/Runner.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filter$1.class b/src/test/resources/junit-target/org/junit/runner/manipulation/Filter$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filter$1.class rename to src/test/resources/junit-target/org/junit/runner/manipulation/Filter$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filter$2.class b/src/test/resources/junit-target/org/junit/runner/manipulation/Filter$2.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filter$2.class rename to src/test/resources/junit-target/org/junit/runner/manipulation/Filter$2.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filter$3.class b/src/test/resources/junit-target/org/junit/runner/manipulation/Filter$3.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filter$3.class rename to src/test/resources/junit-target/org/junit/runner/manipulation/Filter$3.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filter.class b/src/test/resources/junit-target/org/junit/runner/manipulation/Filter.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filter.class rename to src/test/resources/junit-target/org/junit/runner/manipulation/Filter.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filterable.class b/src/test/resources/junit-target/org/junit/runner/manipulation/Filterable.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/manipulation/Filterable.class rename to src/test/resources/junit-target/org/junit/runner/manipulation/Filterable.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/manipulation/NoTestsRemainException.class b/src/test/resources/junit-target/org/junit/runner/manipulation/NoTestsRemainException.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/manipulation/NoTestsRemainException.class rename to src/test/resources/junit-target/org/junit/runner/manipulation/NoTestsRemainException.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/manipulation/Sortable.class b/src/test/resources/junit-target/org/junit/runner/manipulation/Sortable.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/manipulation/Sortable.class rename to src/test/resources/junit-target/org/junit/runner/manipulation/Sortable.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/manipulation/Sorter$1.class b/src/test/resources/junit-target/org/junit/runner/manipulation/Sorter$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/manipulation/Sorter$1.class rename to src/test/resources/junit-target/org/junit/runner/manipulation/Sorter$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/manipulation/Sorter.class b/src/test/resources/junit-target/org/junit/runner/manipulation/Sorter.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/manipulation/Sorter.class rename to src/test/resources/junit-target/org/junit/runner/manipulation/Sorter.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/Failure.class b/src/test/resources/junit-target/org/junit/runner/notification/Failure.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/Failure.class rename to src/test/resources/junit-target/org/junit/runner/notification/Failure.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunListener$ThreadSafe.class b/src/test/resources/junit-target/org/junit/runner/notification/RunListener$ThreadSafe.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunListener$ThreadSafe.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunListener$ThreadSafe.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunListener.class b/src/test/resources/junit-target/org/junit/runner/notification/RunListener.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunListener.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunListener.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$1.class b/src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$1.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$2.class b/src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$2.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$2.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$2.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$3.class b/src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$3.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$3.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$3.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$4.class b/src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$4.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$4.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$4.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$5.class b/src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$5.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$5.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$5.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$6.class b/src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$6.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$6.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$6.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$7.class b/src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$7.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$7.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$7.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$SafeNotifier.class b/src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$SafeNotifier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier$SafeNotifier.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunNotifier$SafeNotifier.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier.class b/src/test/resources/junit-target/org/junit/runner/notification/RunNotifier.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/RunNotifier.class rename to src/test/resources/junit-target/org/junit/runner/notification/RunNotifier.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/StoppedByUserException.class b/src/test/resources/junit-target/org/junit/runner/notification/StoppedByUserException.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/StoppedByUserException.class rename to src/test/resources/junit-target/org/junit/runner/notification/StoppedByUserException.class diff --git a/src/test/resources/junit-target/classes/org/junit/runner/notification/SynchronizedRunListener.class b/src/test/resources/junit-target/org/junit/runner/notification/SynchronizedRunListener.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runner/notification/SynchronizedRunListener.class rename to src/test/resources/junit-target/org/junit/runner/notification/SynchronizedRunListener.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/AllTests.class b/src/test/resources/junit-target/org/junit/runners/AllTests.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/AllTests.class rename to src/test/resources/junit-target/org/junit/runners/AllTests.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/BlockJUnit4ClassRunner$1.class b/src/test/resources/junit-target/org/junit/runners/BlockJUnit4ClassRunner$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/BlockJUnit4ClassRunner$1.class rename to src/test/resources/junit-target/org/junit/runners/BlockJUnit4ClassRunner$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/BlockJUnit4ClassRunner.class b/src/test/resources/junit-target/org/junit/runners/BlockJUnit4ClassRunner.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/BlockJUnit4ClassRunner.class rename to src/test/resources/junit-target/org/junit/runners/BlockJUnit4ClassRunner.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/JUnit4.class b/src/test/resources/junit-target/org/junit/runners/JUnit4.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/JUnit4.class rename to src/test/resources/junit-target/org/junit/runners/JUnit4.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/MethodSorters.class b/src/test/resources/junit-target/org/junit/runners/MethodSorters.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/MethodSorters.class rename to src/test/resources/junit-target/org/junit/runners/MethodSorters.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/Parameterized$Parameter.class b/src/test/resources/junit-target/org/junit/runners/Parameterized$Parameter.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/Parameterized$Parameter.class rename to src/test/resources/junit-target/org/junit/runners/Parameterized$Parameter.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/Parameterized$Parameters.class b/src/test/resources/junit-target/org/junit/runners/Parameterized$Parameters.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/Parameterized$Parameters.class rename to src/test/resources/junit-target/org/junit/runners/Parameterized$Parameters.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/Parameterized$TestClassRunnerForParameters.class b/src/test/resources/junit-target/org/junit/runners/Parameterized$TestClassRunnerForParameters.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/Parameterized$TestClassRunnerForParameters.class rename to src/test/resources/junit-target/org/junit/runners/Parameterized$TestClassRunnerForParameters.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/Parameterized.class b/src/test/resources/junit-target/org/junit/runners/Parameterized.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/Parameterized.class rename to src/test/resources/junit-target/org/junit/runners/Parameterized.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/ParentRunner$1.class b/src/test/resources/junit-target/org/junit/runners/ParentRunner$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/ParentRunner$1.class rename to src/test/resources/junit-target/org/junit/runners/ParentRunner$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/ParentRunner$2.class b/src/test/resources/junit-target/org/junit/runners/ParentRunner$2.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/ParentRunner$2.class rename to src/test/resources/junit-target/org/junit/runners/ParentRunner$2.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/ParentRunner$3.class b/src/test/resources/junit-target/org/junit/runners/ParentRunner$3.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/ParentRunner$3.class rename to src/test/resources/junit-target/org/junit/runners/ParentRunner$3.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/ParentRunner$4.class b/src/test/resources/junit-target/org/junit/runners/ParentRunner$4.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/ParentRunner$4.class rename to src/test/resources/junit-target/org/junit/runners/ParentRunner$4.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/ParentRunner.class b/src/test/resources/junit-target/org/junit/runners/ParentRunner.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/ParentRunner.class rename to src/test/resources/junit-target/org/junit/runners/ParentRunner.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/Suite$SuiteClasses.class b/src/test/resources/junit-target/org/junit/runners/Suite$SuiteClasses.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/Suite$SuiteClasses.class rename to src/test/resources/junit-target/org/junit/runners/Suite$SuiteClasses.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/Suite.class b/src/test/resources/junit-target/org/junit/runners/Suite.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/Suite.class rename to src/test/resources/junit-target/org/junit/runners/Suite.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/FrameworkField.class b/src/test/resources/junit-target/org/junit/runners/model/FrameworkField.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/FrameworkField.class rename to src/test/resources/junit-target/org/junit/runners/model/FrameworkField.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/FrameworkMember.class b/src/test/resources/junit-target/org/junit/runners/model/FrameworkMember.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/FrameworkMember.class rename to src/test/resources/junit-target/org/junit/runners/model/FrameworkMember.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/FrameworkMethod$1.class b/src/test/resources/junit-target/org/junit/runners/model/FrameworkMethod$1.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/FrameworkMethod$1.class rename to src/test/resources/junit-target/org/junit/runners/model/FrameworkMethod$1.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/FrameworkMethod.class b/src/test/resources/junit-target/org/junit/runners/model/FrameworkMethod.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/FrameworkMethod.class rename to src/test/resources/junit-target/org/junit/runners/model/FrameworkMethod.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/InitializationError.class b/src/test/resources/junit-target/org/junit/runners/model/InitializationError.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/InitializationError.class rename to src/test/resources/junit-target/org/junit/runners/model/InitializationError.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/MultipleFailureException.class b/src/test/resources/junit-target/org/junit/runners/model/MultipleFailureException.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/MultipleFailureException.class rename to src/test/resources/junit-target/org/junit/runners/model/MultipleFailureException.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/NoGenericTypeParametersValidator.class b/src/test/resources/junit-target/org/junit/runners/model/NoGenericTypeParametersValidator.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/NoGenericTypeParametersValidator.class rename to src/test/resources/junit-target/org/junit/runners/model/NoGenericTypeParametersValidator.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/RunnerBuilder.class b/src/test/resources/junit-target/org/junit/runners/model/RunnerBuilder.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/RunnerBuilder.class rename to src/test/resources/junit-target/org/junit/runners/model/RunnerBuilder.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/RunnerScheduler.class b/src/test/resources/junit-target/org/junit/runners/model/RunnerScheduler.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/RunnerScheduler.class rename to src/test/resources/junit-target/org/junit/runners/model/RunnerScheduler.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/Statement.class b/src/test/resources/junit-target/org/junit/runners/model/Statement.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/Statement.class rename to src/test/resources/junit-target/org/junit/runners/model/Statement.class diff --git a/src/test/resources/junit-target/classes/org/junit/runners/model/TestClass.class b/src/test/resources/junit-target/org/junit/runners/model/TestClass.class similarity index 100% rename from src/test/resources/junit-target/classes/org/junit/runners/model/TestClass.class rename to src/test/resources/junit-target/org/junit/runners/model/TestClass.class