Changeset a288fc5


Ignore:
Timestamp:
Feb 23, 2012 3:40:31 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
141ad67
Parents:
667bd466
Message:

Move icon URL from _icons to .icons

Location:
apps/i2psnark
Files:
2 edited
18 moved

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/build.xml

    r667bd466 ra288fc5  
    9696        <!-- set if unset -->
    9797        <property name="workspace.changes.tr" value="" />
    98         <war destfile="../i2psnark.war" webxml="../web.xml" basedir="../" includes="_icons/*" >
     98        <copy todir="build/icons/.icons" >
     99            <fileset dir="../icons/" />
     100        </copy>
     101        <war destfile="../i2psnark.war" webxml="../web.xml" >
    99102          <!-- include only the web stuff, as of 0.7.12 the router will add i2psnark.jar to the classpath for the war -->
    100103          <classes dir="./build/obj" includes="**/web/*.class" />
     104            <fileset dir="build/icons/" />
    101105            <manifest>
    102106                <attribute name="Implementation-Version" value="${full.version}" />
     
    110114    <target name="warUpToDate">
    111115        <uptodate property="war.uptodate" targetfile="../i2psnark.war" >
    112             <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../_icons/* ../web.xml" />
     116            <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../icons/* ../web.xml" />
    113117        </uptodate>
    114118    </target>
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    r667bd466 ra288fc5  
    103103    {
    104104        if (pathInContext == null || pathInContext.equals("/") || pathInContext.equals("/index.jsp") ||
    105             pathInContext.equals("/index.html") || pathInContext.startsWith("/_icons/"))
     105            pathInContext.equals("/index.html") || pathInContext.startsWith("/.icons/"))
    106106            return super.getResource(pathInContext);
    107107        // files in the i2psnark/ directory
     
    21162116    /** @since 0.7.14 */
    21172117    private static String toImg(String icon) {
    2118         return "<img alt=\"\" height=\"16\" width=\"16\" src=\"/i2psnark/_icons/" + icon + ".png\">";
     2118        return "<img alt=\"\" height=\"16\" width=\"16\" src=\"/i2psnark/.icons/" + icon + ".png\">";
    21192119    }
    21202120
    21212121    /** @since 0.8.2 */
    21222122    private static String toImg(String icon, String altText) {
    2123         return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"/i2psnark/_icons/" + icon + ".png\">";
     2123        return "<img alt=\"" + altText + "\" height=\"16\" width=\"16\" src=\"/i2psnark/.icons/" + icon + ".png\">";
    21242124    }
    21252125
Note: See TracChangeset for help on using the changeset viewer.