Changeset 5226


Ignore:
Timestamp:
05/19/14 09:07:55 (10 years ago)
Author:
Twan Goosen
Message:

merged some fixes from trunk to 3.0

Location:
vlo/branches/vlo-3.0
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • vlo/branches/vlo-3.0

  • vlo/branches/vlo-3.0/CHANGES

    r5221 r5226  
    1111        see <https://trac.clarin.eu/ticket/554>
    1212* Styling of CMDI to HTML transormation output
     13* Added simple search page to breadcrumbs
    1314
    1415VLO 3.0-beta3 (May 2014)

  • vlo/branches/vlo-3.0/vlo-commons

  • vlo/branches/vlo-3.0/vlo-commons/src/main/resources/VloConfig.xml

    r5206 r5226  
    6464        move the collection facet in with the other facets).
    6565    -->
    66     <collectionFacet>collection</collectionFacet>
     66    <!--<collectionFacet>collection</collectionFacet>-->
    6767   
    6868    <!-- Fields shown as facets on the search page -->
    69     <facetFields>
     69    <facetFields>       
    7070        <facetField>language</facetField>
     71        <facetField>collection</facetField>
    7172        <facetField>resourceClass</facetField>
    7273        <facetField>continent</facetField>
    … …  
    8485    <simpleSearchFacetFields>
    8586        <simpleSearchFacetField>language</simpleSearchFacetField>
     87        <simpleSearchFacetField>collection</simpleSearchFacetField>
    8688        <simpleSearchFacetField>resourceClass</simpleSearchFacetField>
     89        <simpleSearchFacetField>modality</simpleSearchFacetField>
    8790        <simpleSearchFacetField>genre</simpleSearchFacetField>
    88         <simpleSearchFacetField>nationalProject</simpleSearchFacetField>
    8991    </simpleSearchFacetFields>
    9092   

  • vlo/branches/vlo-3.0/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java

    r5150 r5226  
    675675        List<String> expResult = Arrays.asList(
    676676                "language",
     677                "collection",
    677678                "resourceClass",
    678679                "continent",
    … …  
    696697        final String[] expItems = new String[]{
    697698            "language",
     699            "collection",
    698700            "resourceClass",
    699701            "modality",
    … …  
    960962    public void testGetCollectionFacet() {
    961963        final String result = config.getCollectionFacet();
    962         assertEquals("collection", result);
     964        assertNull(result);
    963965    }
    964966
    … …  
    978980    public void testGetSimpleSearchFacetFields() {
    979981        List<String> result = config.getSimpleSearchFacetFields();
    980         assertEquals(4, result.size());
     982        assertEquals(5, result.size());
    981983    }
    982984}

  • vlo/branches/vlo-3.0/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java

    r5150 r5226  
    5656        assertEquals("http://localhost:8080/vlo-solr/core0/", config.getSolrUrl());
    5757        assertEquals(2, config.getDataRoots().size());
    58         assertEquals(12, config.getFacetFields().size());
     58        assertEquals(13, config.getFacetFields().size());
    5959    }
    6060

  • vlo/branches/vlo-3.0/vlo-web-app

  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/BreadCrumbPanel.html

    r5028 r5226  
    2424    <body>
    2525        <wicket:panel>
    26             <a wicket:id="mainpage">VLO</a>
     26            <wicket:link>
     27                <a href="SimpleSearchPage.html">VLO</a>
     28            </wicket:link>
     29            &gt; <a wicket:id="searchPage">Faceted search</a>
    2730            <wicket:container wicket:id="query">
    2831                &gt; <a wicket:id="leavequery">Search: &quot;<span wicket:id="content"></span>&quot;</a>

  • vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/BreadCrumbPanel.java

    r5031 r5226  
    6161    public BreadCrumbPanel(String id, IModel<QueryFacetsSelection> model) {
    6262        super(id, model);
    63         add(new BookmarkablePageLink("mainpage", FacetedSearchPage.class));
     63        add(new BookmarkablePageLink("searchPage", FacetedSearchPage.class));
    6464        add(query = createQuery(model, "query"));
    6565        add(facets = createFacets(model, "facets"));

  • vlo/branches/vlo-3.0/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/style.less

    r5149 r5226  
    216216.sbilinks li
    217217{ list-style: none;
    218   padding: 0px 0px 0px 0px;
     218  padding: 0px 0px 0px 14px;
    219219  margin: 0px 0px 5px 0px;
    220220}
    … …  
    222222.sbilinks li a, .sbilinks li a:hover
    223223{
    224     padding: 0px 0px 2px 14px;
     224    padding: 0px 0px 2px 0px;
    225225    height: 16px;
    226226    text-decoration: none;

  • vlo/branches/vlo-3.0/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-facets.less

    r5157 r5226  
    6666.facetvalues li
    6767{ list-style: none;
    68   padding: 0px 0px 0px 0px;
    69   margin: 0px 0px 5px 0px;
     68  margin: 7px 0px 7px 0px;
    7069}
    7170
    … …  
    8180
    8281.facetvalue, .selectedfacetvalue {
    83     padding: 0px 0px 2px 14px;
    8482    font-weight: bold;
    8583}
Note: See TracChangeset for help on using the changeset viewer.