Changeset 6337


Ignore:
Timestamp:
07/02/15 10:13:22 (9 years ago)
Author:
Twan Goosen
Message:

Added link with pop-up for search syntax help (todo: actual page)
refs #762

Location:
vlo/trunk/vlo-web-app
Files:
28 added
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • vlo/trunk/vlo-web-app/nb-configuration.xml

    r5146 r6337  
    2121-->
    2222        <org-netbeans-modules-css-prep.less_2e_configured>true</org-netbeans-modules-css-prep.less_2e_configured>
     23        <org-netbeans-modules-css-prep.less_2e_mappings>/less:/css</org-netbeans-modules-css-prep.less_2e_mappings>
     24        <org-netbeans-modules-css-prep.less_2e_enabled>false</org-netbeans-modules-css-prep.less_2e_enabled>
     25        <org-netbeans-modules-css-prep.sass_2e_enabled>false</org-netbeans-modules-css-prep.sass_2e_enabled>
     26        <org-netbeans-modules-css-prep.sass_2e_compiler_2e_options/>
     27        <org-netbeans-modules-css-prep.less_2e_compiler_2e_options/>
     28        <org-netbeans-modules-css-prep.sass_2e_mappings>/scss:/css</org-netbeans-modules-css-prep.sass_2e_mappings>
     29        <org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>js/libs</org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder>
     30        <org-netbeans-modules-whitelist.whitelist-oracle>false</org-netbeans-modules-whitelist.whitelist-oracle>
    2331    </properties>
    2432</project-shared-configuration>

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java

    r5161 r6337  
    1919import eu.clarin.cmdi.vlo.wicket.pages.RecordPage;
    2020import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage;
     21import org.apache.wicket.request.resource.CssResourceReference;
    2122import org.apache.wicket.request.resource.JavaScriptResourceReference;
    2223
    … …  
    2930    private final static JavaScriptResourceReference VLO_FRONT = new JavaScriptResourceReference(VloBasePage.class, "vlo-front.js");
    3031    private final static JavaScriptResourceReference VLO_HEADER = new JavaScriptResourceReference(VloBasePage.class, "vlo-header.js");
     32    private final static JavaScriptResourceReference VLO_SYNTAX_HELP = new JavaScriptResourceReference(VloBasePage.class, "vlo-syntax-help.js");
     33    private final static JavaScriptResourceReference JQUERY_UI = new JavaScriptResourceReference(VloBasePage.class, "jquery-ui-1.11.4.custom/jquery-ui.min.js");
     34    private final static CssResourceReference JQUERY_UI_CSS = new CssResourceReference(VloBasePage.class, "jquery-ui-1.11.4.custom/jquery-ui.min.css");
    3135    private final static JavaScriptResourceReference JQUERY_WATERMARK = new JavaScriptResourceReference(VloBasePage.class, "jquery.watermark-3.1.4/jquery.watermark.min.js");
    3236    private final static JavaScriptResourceReference HIGHLIGHT = new JavaScriptResourceReference(RecordPage.class, "searchhi.js");
    … …  
    4044    }
    4145
     46    public static JavaScriptResourceReference getJQueryUIJS() {
     47        return JQUERY_UI;
     48    }
     49    public static CssResourceReference getJQueryUICSS() {
     50        return JQUERY_UI_CSS;
     51    }
     52
    4253    public static JavaScriptResourceReference getJQueryWatermarkJS() {
    4354        return JQUERY_WATERMARK;
    4455    }
    45    
     56
    4657    public static JavaScriptResourceReference getHighlightJS() {
    4758        return HIGHLIGHT;
    4859    }
    4960
     61    public static JavaScriptResourceReference getSyntaxHelpJS() {
     62        return VLO_SYNTAX_HELP;
     63    }
     64
    5065}

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java

    r6210 r6337  
    9090                JavaScriptResources.getVloFrontJS(),
    9191                JavaScriptResources.getVloHeaderJS(),
     92                JavaScriptResources.getJQueryUIJS(),
    9293                JavaScriptResources.getJQueryWatermarkJS()
    9394        );

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchFormPanel.html

    r6334 r6337  
    3030                        <input wicket:id="searchSubmit" id="searchbutton" type="submit" value="Search"/>
    3131                    </span>
    32                     <!--<a id="syntax-help" href="#"><span>?</span></a>-->
     32                    <a id="syntax-help" href="SyntaxHelp.html" title="You can use &lt;em&gt;advanced search syntax&lt;/em&gt; here, for example by using the keywords AND, OR and NOT. &lt;strong&gt;Click to learn more.&lt;/strong&gt;"><span>?</span></a>
    3333                </p>
    3434            </form>

  • vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchFormPanel.java

    r6334 r6337  
    1717package eu.clarin.cmdi.vlo.wicket.panels.search;
    1818
     19import eu.clarin.cmdi.vlo.JavaScriptResources;
    1920import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
    2021import eu.clarin.cmdi.vlo.service.solr.AutoCompleteService;
    … …  
    2324import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton;
    2425import org.apache.wicket.extensions.ajax.markup.html.autocomplete.AutoCompleteTextField;
     26import org.apache.wicket.markup.head.CssHeaderItem;
     27import org.apache.wicket.markup.head.IHeaderResponse;
     28import org.apache.wicket.markup.head.JavaScriptHeaderItem;
    2529import org.apache.wicket.markup.html.form.Form;
    2630import org.apache.wicket.markup.html.panel.GenericPanel;
    … …  
    6771
    6872    protected abstract void onSubmit(AjaxRequestTarget target);
     73
     74    @Override
     75    public void renderHead(IHeaderResponse response) {
     76        // include watermark JQuery extension sources
     77        response.render(CssHeaderItem.forReference(JavaScriptResources.getJQueryUICSS()));
     78        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getJQueryUIJS()));
     79        response.render(JavaScriptHeaderItem.forReference(JavaScriptResources.getSyntaxHelpJS()));
     80    }
    6981}

  • vlo/trunk/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/vlo-syntax-help.js

    r6332 r6337  
    1717
    1818
    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();
     19$(function () {
     20    $("#search").tooltip({
     21        content: function () {
     22            return this.getAttribute("title");
     23        }
    2524    });
    2625});
     26

  • vlo/trunk/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less

    r6232 r6337  
    230230    background-image: url('document-256.png'); /* icon from icons8.com */
    231231}
     232
     233a#syntax-help {
     234    display: inline-block;
     235    min-height: 1.5em;
     236    width: 1.5em;
     237    background-repeat: no-repeat;
     238    background-size: 1.5em;
     239    background-image: url('help-64.png'); /* icon from icons8.com */
     240    vertical-align: top;
     241    padding: 0px;
     242    margin: 0px;
     243}
     244
     245a#syntax-help span {
     246    display: none;
     247}
Note: See TracChangeset for help on using the changeset viewer.