Commit 5f0faffb authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Added UCD Search Dialog, schema panel checkboxs improvements

parent e2505e9e

src/java/it/inaf/oats/ia2/tap/utils/AjaxCheckBox.java→src/java/it/inaf/oats/ia2/tap/utils/AjaxCheckBoxCustom.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ import org.apache.wicket.model.IModel; 
 * 

 * @author pietro

 */

public class AjaxCheckBox extends CheckBox {

public class AjaxCheckBoxCustom extends CheckBox {

    

    private String idString;
@@ -27,7 +27,7 @@ public class AjaxCheckBox extends CheckBox { 
     * @param id

     * @param model 

     */

    public AjaxCheckBox(String id, IModel model)

    public AjaxCheckBoxCustom(String id, IModel model)

    {

        super(id, model);

        /*

src/java/it/inaf/oats/ia2/tap/utils/AjaxTextField.java

+483 −483

File changed.

Preview size limit exceeded, changes collapsed.

src/java/it/inaf/oats/ia2/tap/utils/Application.java

+15 −15
Original line number Diff line number Diff line 
/*

 * To change this template, choose Tools | Templates

 * and open the template in the editor.

 */

package it.inaf.oats.ia2.tap.utils;



import org.apache.wicket.Page;

import org.apache.wicket.markup.html.SecurePackageResourceGuard;

import org.apache.wicket.protocol.http.WebApplication;

import org.apache.wicket.request.resource.JavaScriptResourceReference;

import org.apache.wicket.response.filter.ServerAndClientTimeFilter;



/**
@@ -14,34 +12,36 @@ import org.apache.wicket.response.filter.ServerAndClientTimeFilter; 
 */

public class Application extends WebApplication {



    private static final JavaScriptResourceReference JQUERY_REF = new JavaScriptResourceReference(BasePage.class, "js/jquery-1.11.3.min.js");



    /**

     * Constructor.

     */

    public Application()

    {

    public Application() {

    }



    /**

     * @see org.apache.wicket.protocol.http.WebApplication#init()

     */

    @Override

    protected void init()

    {

    protected void init() {

        getDebugSettings().setDevelopmentUtilitiesEnabled(true);



        getRequestCycleSettings().addResponseFilter(new ServerAndClientTimeFilter());

        

        // Setting custom jQuery reference

        getJavaScriptLibrarySettings().setJQueryReference(JQUERY_REF);

        

        // Add permission to load font files

        ((SecurePackageResourceGuard)getResourceSettings().getPackageResourceGuard())

                .addPattern("+glyphicons-halflings-regular.*");

    }



    /**

     * @see org.apache.wicket.Application#getHomePage()

     */

    @Override

    public Class<? extends Page> getHomePage()

    {

        //return Index.class;

        //return HomePage.class;

    public Class<? extends Page> getHomePage() {

        return CredentialPage.class;

    }



    

}

src/java/it/inaf/oats/ia2/tap/utils/BasePage.html

+2 −3
Original line number Diff line number Diff line
@@ -5,9 +5,8 @@ 
        <meta name="description" content="Put your description here!" /> 

    <wicket:head> 

        <wicket:link> 

            <!--<script src="js/jquery.min.js"></script>

            <script src="js/bootstrap.min.js"></script>-->

            <script src="js/main.js"></script>

            <!--<script src="js/bootstrap.min.js"></script>

            <script src="js/main.js"></script>-->

            <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/> 

            <link rel="stylesheet" type="text/css" href="css/bootstrap-theme.min.css"/> 

            <link rel="stylesheet" type="text/css" href="css/style.css"/>

src/java/it/inaf/oats/ia2/tap/utils/BasePage.java

+19 −2
Original line number Diff line number Diff line
@@ -7,14 +7,16 @@ import org.apache.wicket.ajax.AjaxRequestTarget; 
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;

import org.apache.wicket.behavior.AttributeAppender;

import org.apache.wicket.behavior.Behavior;

import org.apache.wicket.markup.head.IHeaderResponse;

import org.apache.wicket.markup.head.JavaScriptHeaderItem;

import org.apache.wicket.markup.html.WebMarkupContainer;

import org.apache.wicket.markup.html.WebPage;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.form.TextArea;

import org.apache.wicket.markup.html.list.ListItem;

import org.apache.wicket.markup.html.list.ListView;

import org.apache.wicket.markup.html.panel.GenericPanel;

import org.apache.wicket.model.Model;

import org.apache.wicket.request.resource.JavaScriptResourceReference;

import org.apache.wicket.request.resource.UrlResourceReference;



/**

 *
@@ -23,6 +25,9 @@ import org.apache.wicket.model.Model; 
 */

public abstract class BasePage extends WebPage {



    private static final JavaScriptResourceReference BOOTSTRAP_REF = new JavaScriptResourceReference(BasePage.class, "js/bootstrap.min.js");

    private static final JavaScriptResourceReference MAIN_REF = new JavaScriptResourceReference(BasePage.class, "js/main.js");

    

    private final Label titleLabel;

    private final String title;

    private final WebMarkupContainer alertPanel;
@@ -96,6 +101,18 @@ public abstract class BasePage extends WebPage { 
        });

    }



    @Override

    public void renderHead(IHeaderResponse response) {

        super.renderHead(response);



        // Always add jQuery

        response.render(JavaScriptHeaderItem.forReference(getApplication()

                .getJavaScriptLibrarySettings().getJQueryReference()));

        

        response.render(JavaScriptHeaderItem.forReference(BOOTSTRAP_REF));

        response.render(JavaScriptHeaderItem.forReference(MAIN_REF));

    }



    protected void addInfo(String message) {

        alerts.add(new Alert(message, AlertType.INFO));

    }