diff options
author | rsiddharth <rsiddharth@ninthfloor.org> | 2012-12-21 13:25:10 +0530 |
---|---|---|
committer | rsiddharth <rsiddharth@ninthfloor.org> | 2012-12-21 13:25:10 +0530 |
commit | 7f46c19441f6690bde92c1359c535321cb8c3025 (patch) | |
tree | 73ad82bfba3ed35fa9707d73ae7c0dd4c63c6eb6 /parsers/BackButton.java | |
parent | bed3dc00c9112d70966990ca66ab0a078b5ca0b5 (diff) | |
parent | 03ab823d0318865544c54baaaa0b4ebb63fae4fa (diff) |
merged from devel branch.
removed:
Scruf.java
todo
added:
Run.java
TODO
parsers/SymbolMap.java
modified:
conversion/ConvertDirectory.java
parsers/BackButton.java
parsers/CodeBlocks.java
parsers/WordDecoration.java
styling/StyleChecker.java
styling/style.css
pending merges:
rsiddharth 2012-12-21 [bug-fix]: when the default style sheet is newer than the style sheet
rsiddharth 2012-12-21 Scruf.java has been renamed to Run.java
rsiddharth 2012-12-21 [method named changed]: The method named 'resolve()' in styling/StyleChecker.java is changed ...
rsiddharth 2012-12-21 [bug-fix]: Each directory is checked if it contains the style.css, if
rsiddharth 2012-12-21 added license text to parsers/SymbolMap.java.
rsiddharth 2012-12-21 updated TODO
rsiddharth 2012-12-20 [bug-fix]: From now on, all the special characters in the string
rsiddharth 2012-12-20 SymbolMap class which was in CodeBlock.java is shifted to a dedicated
rsiddharth 2012-12-20 [bug-fix]: Back Buttons were not put in webpages that were present in
rsiddharth 2012-12-15 bunch of new todos; 'todo' renamed to 'TODO'.
Diffstat (limited to 'parsers/BackButton.java')
-rw-r--r-- | parsers/BackButton.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/parsers/BackButton.java b/parsers/BackButton.java index e504648..38e5a9e 100644 --- a/parsers/BackButton.java +++ b/parsers/BackButton.java @@ -29,14 +29,15 @@ public class BackButton implements Parser { // this method doesn't modify the filContent. public String parse(String fileContent) { StringBuilder fileBuilder = new StringBuilder(fileContent); + String fileName = PresentFile.file.getName(); /** * Back button is added only if the present directory being * parsed is not 'root'. */ - if(DirectoryInfo.level!=0) { + if(DirectoryInfo.level!=0 || !(fileName.equals("index.scruffy"))) { fileBuilder.append("\n<div class=\"back\">\n"); fileBuilder.append("<a href=\""); - if(PresentFile.file.getName().equals("index.scruffy")) { + if(fileName.equals("index.scruffy")) { fileBuilder.append("../\"> back "); }else { fileBuilder.append("./\"> back "); |