Changeset 1094


Ignore:
Timestamp:
01/26/11 11:06:57 (13 years ago)
Author:
patdui
Message:

Fixed scaling of image and created a back link to the vlo. (new images with typo fixed)
​http://trac.clarin.eu/ticket/92 and ​http://trac.clarin.eu/ticket/93

Location:
vlo/trunk/vlo_webapp/src/main
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/Configuration.java

    r1043 r1094  
    2929    private String language3LetterCodeComponentUrl = "http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/components/clarin.eu:cr1:c_1271859438110/xml";
    3030    private String silToISO639CodesUrl = "http://www.clarin.eu/cmd/xslt/sil_to_iso6393.xml";
     31
     32    private String vloHomeLink = "http://www.clarin.eu/vlo";//default can be overridden in xml
    3133   
    3234   
    … …  
    107109        this.silToISO639CodesUrl = silToISO639CodesUrl;
    108110    }
     111
     112    public String getVloHomeLink() {
     113        return vloHomeLink;
     114    }
     115   
     116    public void setVloHomeLink(String vloHomeLink) {
     117        this.vloHomeLink = vloHomeLink;
     118    }
    109119}

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/VloApplication.properties

    r1065 r1094  
    22# See eu.clarin.cmdi.vlo.Resources for the key constants.
    33backToResult=back to results
     4facetedBrowserResources=Faceted Browser Resources
    45field=Field
    56more=more
    … …  
    1516subcategoriesIn=Subcategories in
    1617value=Value
     18VLO_home=VLO Home

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/BasePage.html

    r1061 r1094  
    1212            </div>
    1313            <div id="topright">
    14                 <img width="498" height="176" alt="" src="css/toprightvlo.gif" usemap="#partnerLinks">
     14                <img width="526" height="176" alt="" src="css/toprightvlo.gif" usemap="#partnerLinks">
    1515                <map name="partnerLinks">
    1616                    <AREA SHAPE="rect" COORDS="114.00,65,167.50,104" HREF="http://www.clarin.eu" alt="clarin link"/>
    … …  
    2020                    <AREA SHAPE="rect" COORDS="328,65,370,104" HREF="http://www.mpi.nl/dobes" alt="dobes link"/>
    2121                    <AREA SHAPE="rect" COORDS="379,65,428,104" HREF="http://www.dfki.de/web" alt="dfki link"/>
    22                     <AREA SHAPE="rect" COORDS="434,65,484,104" HREF="http://www.delaman.org/" alt="deleman link link"/>
     22                    <AREA SHAPE="rect" COORDS="434,65,484,104" HREF="http://www.delaman.org/" alt="deleman link"/>
    2323                </map>
    2424            </div>

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.html

    r1083 r1094  
    88            <div border="0" class="opening" width="100%">
    99                <form class="search" wicket:id="searchForm">
    10                     <div id="searchmodule">
    11                         <input type="text"  wicket:id="searchQuery" />&nbsp;
    12                         <button wicket:id="searchSubmit"><wicket:message key="search">[search]</wicket:message></button>
     10                    <div class="homeLink"><a wicket:id="vloHomeLink"><wicket:message key="VLO_home"/></a> &gt;&gt; <a><wicket:message key="facetedBrowserResources"/></a></div>
     11                    <div style="display: none;"><input name="id1_hf_0" id="id1_hf_0" type="hidden"></div>
     12                    <div class="searchmodule">
     13                        <input name="searchQuery" type="text">&nbsp;
     14                        <button name="searchSubmit" id="id2"><wicket:message key="search"/></button>
    1315                    </div>
    1416                </form>

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

    r1007 r1094  
    1616import org.apache.wicket.markup.html.form.Form;
    1717import org.apache.wicket.markup.html.form.TextField;
     18import org.apache.wicket.markup.html.link.ExternalLink;
    1819import org.apache.wicket.markup.repeater.Item;
    1920import org.apache.wicket.markup.repeater.data.GridView;
    … …  
    2223import org.apache.wicket.model.ResourceModel;
    2324
     25import eu.clarin.cmdi.vlo.Configuration;
    2426import eu.clarin.cmdi.vlo.Resources;
    2527
    … …  
    4951        public SearchBoxForm(String id, SearchPageQuery query) {
    5052            super(id, new CompoundPropertyModel<SearchPageQuery>(query));
     53            add(new ExternalLink("vloHomeLink", Configuration.getInstance().getVloHomeLink()));
    5154            searchBox = new TextField("searchQuery");
    5255            add(searchBox);

  • vlo/trunk/vlo_webapp/src/main/webapp/css/main.css

    r1084 r1094  
    7171    padding-bottom: 11px;
    7272}
    73 #searchmodule{
    74     margin-left:50%;
    75     margin-right: auto;
     73
     74.middlegame .searchmodule {
     75    margin-left:20%;
     76    display:inline
    7677}
     78
     79.middlegame .homeLink {
     80    margin-left: 11px;
     81    display:inline
     82}
     83
    7784.facet_facetOrigin .facetbox {
    7885    background-color: #2E6B99;
Note: See TracChangeset for help on using the changeset viewer.