This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 30ebbd87f5eaf3513cfdb32a9fb2e0f1d73b40c0 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Mon Jun 1 16:47:52 2015 +0200 Add an icon to the image files in the browsing trees --- .../scmwebeditor/uiweb/actions/BrowseAction.java | 21 +++++++++++++-------- .../scmwebeditor/uiweb/actions/GetImageAction.java | 2 +- swe-ui-web/src/main/webapp/css/main.css | 14 ++++++++++---- swe-ui-web/src/main/webapp/img/icons/image.png | Bin 0 -> 623 bytes 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java index 70cab1d..e37d3a8 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/BrowseAction.java @@ -198,22 +198,27 @@ public class BrowseAction extends AbstractScmWebEditorAction implements ServletR node.setTitle(file.substring(file.lastIndexOf("/") + 1)); node.setState(TreeNode.NODE_STATE_LEAF); - if (file.toLowerCase().endsWith((".js"))) { + String fileName = file.toLowerCase(); + + if (fileName.endsWith((".js"))) { node.setIcon("ui-icon-js"); - } else if (file.toLowerCase().endsWith(".html") || file.toLowerCase().endsWith(".htm")) { + } else if (fileName.endsWith(".html") || file.toLowerCase().endsWith(".htm")) { node.setIcon("ui-icon-html"); - } else if (file.toLowerCase().endsWith(".xml")) { + } else if (fileName.endsWith(".xml")) { node.setIcon("ui-icon-xml"); - } else if (file.toLowerCase().endsWith(".java")) { + } else if (fileName.endsWith(".java")) { node.setIcon("ui-icon-java"); - } else if (file.toLowerCase().endsWith(".css")) { + } else if (fileName.endsWith(".css")) { node.setIcon("ui-icon-css"); - } else if (file.toLowerCase().endsWith(".rst")) { + } else if (fileName.endsWith(".rst")) { node.setIcon("ui-icon-rst"); - } else if (file.toLowerCase().endsWith(".tex")) { + } else if (fileName.endsWith(".tex")) { node.setIcon("ui-icon-tex"); - } else if (file.toLowerCase().endsWith(".txt")) { + } else if (fileName.endsWith(".txt")) { node.setIcon("ui-icon-txt"); + } else if (fileName.endsWith(".jpg") || fileName.endsWith(".jpeg") || fileName.endsWith(".png") + || fileName.endsWith(".gif")) { + node.setIcon("ui-icon-image"); } else { node.setIcon("ui-icon-document"); } diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/GetImageAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/GetImageAction.java index 65537d4..db836c4 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/GetImageAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/GetImageAction.java @@ -68,7 +68,7 @@ public class GetImageAction extends ScmWebEditorMainAction implements ServletReq originalImage = ImageIO.read(fileImage); ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ImageIO.write(originalImage, imagePath.substring(imagePath.length() - 3), baos); + ImageIO.write(originalImage, imagePath.substring(imagePath.lastIndexOf('.') + 1), baos); baos.flush(); imageInByte = baos.toByteArray(); baos.close(); diff --git a/swe-ui-web/src/main/webapp/css/main.css b/swe-ui-web/src/main/webapp/css/main.css index 5ae4a10..313021e 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -75,20 +75,26 @@ ul.flags li { background-position: 0 1px !important ; } -.ui-icon-tex { - background-image:url("../img/icons/tex.png") !important; +.ui-icon-rst { + background-image:url("../img/icons/rst.png") !important; background-position: 0 1px !important ; } -.ui-icon-rst { - background-image:url("../img/icons/rst.png") !important; +.ui-icon-tex { + background-image:url("../img/icons/tex.png") !important; background-position: 0 1px !important ; } + .ui-icon-txt { background-image:url("../img/icons/txt.png") !important; background-position: 0 1px !important ; } +.ui-icon-image { + background-image:url("../img/icons/image.png") !important; + background-position: 0 1px !important ; +} + .ui-icon-document { background-image:url("../img/icons/file.png") !important; background-position: 0 1px !important ; diff --git a/swe-ui-web/src/main/webapp/img/icons/image.png b/swe-ui-web/src/main/webapp/img/icons/image.png new file mode 100644 index 0000000..f8b6558 Binary files /dev/null and b/swe-ui-web/src/main/webapp/img/icons/image.png differ -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.