Changeset 4229


Ignore:
Timestamp:
01/08/14 16:17:12 (10 years ago)
Author:
twagoo
Message:

Fixed images resources: moved them into src/main/resources - which is now also picked up by maven, and use package resource mechanism of wicket to refer to them (shortcut via Image constructor)

Location:
vlo/branches/to-wicket-1.6/vlo_web_app
Files:
6 added
5 edited
7 moved

Legend:

Unmodified
Added
Removed

  • vlo/branches/to-wicket-1.6/vlo_web_app/pom.xml

    r4220 r4229  
    7878                    <exclude>**/*.java</exclude>
    7979                </excludes>
     80            </resource>
     81            <resource>
     82                <directory>src/main/resources</directory>
     83                <filtering>true</filtering>
    8084            </resource>
    8185            <resource>

  • vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java

    r4208 r4229  
    7171        extraParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName());
    7272        extraParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1");
    73        
     73        //TODO: merge again once implemented
    7474        facetParameters.merge(extraParameters);
    7575
    76         add(new BookmarkablePageLink("showMore", ShowAllFacetValuesPage.class, facetParameters) {
     76        add(new BookmarkablePageLink("showMore", ShowAllFacetValuesPage.class, extraParameters) {
    7777            @Override
    7878            public boolean isVisible() {

  • vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/LandingPageLinkPanel.java

    r4220 r4229  
    1919    private final static ImageResource LANDINGPAGE_ICON =
    2020            new ImageResource(
    21             "Images/Crystal_Clear_mimetype_readme.png",
     21            "Crystal_Clear_mimetype_readme.png",
    2222            "Landing page");
    2323

  • vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanel.java

    r4220 r4229  
    3030            "http://www.nbn-resolving.org/redirect/";
    3131
    32     private final static ImageResource ANNOTATION = new ImageResource("Images/text-x-log.png", "Annotation file");
    33     private final static ImageResource AUDIO = new ImageResource("Images/audio-x-generic.png", "Audio file");
    34     private final static ImageResource IMAGE = new ImageResource("Images/image-x-generic.png", "Image file");
    35     private final static ImageResource TEXT = new  ImageResource("Images/text-x-generic.png", "Text file");
    36     private final static ImageResource VIDEO = new ImageResource("Images/video-x-generic.png", "Video file");
     32    private final static ImageResource ANNOTATION = new ImageResource("text-x-log.png", "Annotation file");
     33    private final static ImageResource AUDIO = new ImageResource("audio-x-generic.png", "Audio file");
     34    private final static ImageResource IMAGE = new ImageResource("image-x-generic.png", "Image file");
     35    private final static ImageResource TEXT = new  ImageResource("text-x-generic.png", "Text file");
     36    private final static ImageResource VIDEO = new ImageResource("video-x-generic.png", "Video file");
    3737
    3838    private final static Map<String, ImageResource> ICON_MAP = new

  • vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SearchPageLinkPanel.java

    r4220 r4229  
    1818
    1919    private final static ImageResource SEARCHPAGE_ICON =
    20             new ImageResource("Images/Crystal_Clear_action_filefind.png",
     20            new ImageResource("Crystal_Clear_action_filefind.png",
    2121            "Search page");
    2222
Note: See TracChangeset for help on using the changeset viewer.