Changeset 4732


Ignore:
Timestamp:
03/17/14 15:57:40 (11 years ago)
Author:
Twan Goosen
Message:

layout, location, animation of permalink field

Location:
vlo/branches/vlo-3.0/vlo-web-app/src/main
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    r4653 r4732  
    4141        <script src="js/jquery-1.10.2.js" type="text/javascript"></script>
    4242        <!-- TODO: Include in header per page? -->
     43        <script src="js/vlo-header.js" type="text/javascript"></script>
    4344        <script src="js/vlo-front.js" type="text/javascript"></script>
    4445        <script src="js/vlo-facets.js" type="text/javascript"></script>

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

    r4723 r4732  
    2525        <wicket:panel>
    2626            <a wicket:id="linkrequest" id="permalink" href="" title="Link to this page"><span>[Link to this page]</span></a>
    27             <input wicket:id="linkfield" type="text"></input>
     27            <input wicket:id="linkfield" type="text" id="permalinkfield"></input>
    2828        </wicket:panel>
    2929    </body>

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

    r4724 r4732  
    2121import eu.clarin.cmdi.vlo.service.PageParametersConverter;
    2222import org.apache.solr.common.SolrDocument;
     23import org.apache.wicket.ajax.AjaxEventBehavior;
    2324import org.apache.wicket.ajax.AjaxRequestTarget;
    2425import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
    … …  
    6667                // toggle
    6768                linkVisibilityModel.setObject(!linkVisibilityModel.getObject());
     69
     70                if (target != null && linkVisibilityModel.getObject()) {
     71                    target.appendJavaScript("permalinkShown();");
     72                }
     73
    6874                // callback to react to change
    6975                onChange(target);
    … …  
    8086
    8187        };
    82         linkField.setEnabled(false);
    8388
    8489        add(linkField);

  • vlo/branches/vlo-3.0/vlo-web-app/src/main/webapp/js/vlo-header.js

    r4664 r4732  
    1616 */
    1717
     18function permalinkShown() {
     19    $("#permalinkfield").hide();
    1820
    19 $(document).ready(function() {
    20     $("#frontfacets .facet").hide();
    21     $("a#filterlanguage").click(function(event) {
    22         event.preventDefault();
    23         $("#facetlanguage").slideToggle(200);
    24         $("#facetlanguage").find("input").focus();
     21    $("#permalinkfield").focus(function() {
     22        // Select input field contents
     23        this.select();
    2524    });
    26 });
     25   
     26    $("#permalinkfield").slideDown('fast');
     27    $("#permalinkfield").select();
     28}

  • vlo/branches/vlo-3.0/vlo-web-app/src/main/webapp/style/vlo-header.css

    r4695 r4732  
    123123    content: "✕";
    124124}
     125
     126#permalinkfield
     127{
     128    float: right;
     129    position: relative;
     130    top: 1em;
     131    width: 30em;
     132    margin-bottom: 1em;
     133    text-align: right;
     134}
Note: See TracChangeset for help on using the changeset viewer.