Changeset 4595


Ignore:
Timestamp:
02/28/14 10:38:45 (10 years ago)
Author:
Twan Goosen
Message:

facet subpanels don't declare div, moved to parent. fixes layout of collections panel

Location:
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r4588 r4595  
    2323import org.apache.solr.client.solrj.response.FacetField;
    2424import org.apache.wicket.ajax.AjaxRequestTarget;
     25import org.apache.wicket.behavior.Behavior;
    2526import org.apache.wicket.markup.html.panel.Panel;
    2627import org.apache.wicket.model.IModel;

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

    r4538 r4595  
    2323    </head>
    2424    <body>
    25     <wicket:panel>
    26         <div class="facet collapsedfacet">
     25        <wicket:panel>
    2726            <a href="#" class="expandfacet"><span>expand</span></a>
    2827            <a href="#" class="collapsefacet"><span>collapse</span></a>
    … …  
    3837                </ul>
    3938            </div>
    40         </div>
    41     </wicket:panel>
    42 </body>
     39        </wicket:panel>
     40    </body>
    4341</html>

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

    r4515 r4595  
    3232                </p>
    3333                <wicket:container wicket:id="facets">
    34                     <div wicket:id="facet">[facet]</div>
     34                    <div class="facet collapsedfacet" wicket:id="facet">[facet]</div>
    3535                </wicket:container>
    3636                <!-- rounded corners - bottom **** -->

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

    r4540 r4595  
    2424    <body>
    2525        <wicket:panel>
    26             <div class="facet collapsedfacet">
    27                 <a href="#" class="expandfacet"><span>expand</span></a>
    28                 <a href="#" class="collapsefacet"><span>collapse</span></a>
    29                 <h1><a href="#"><wicket:container wicket:id="facet">[TITLE]</wicket:container></a></h1>
    30                 <div wicket:id="facetValueRemover" class="selectedvaluelabel">
    31                     <wicket:container wicket:id="facetValue">value</wicket:container>
    32                     <a wicket:id="unselectValue" class="unselectfacetvalue" title="unselect value">
    33                         <span>[unselect]</span>
    34                     </a>
    35                 </div>
    36                 <div class="sbilinks facetvalues">
    37                     <ul>
    38                         <li><span class="selectedfacetvalue">Dutch</span><a class="unselectfacetvalue" title="unselect value" href="index2.html"><span>[unselect]</span></a></li>
    39                         <li><span class="facetvalue">English</span></li>
    40                         <li><span class="facetvalue">German</span></li>
    41                         <li><span class="facetvalue">French</span></li>
    42                         <li><span class="facetvalue">Spanish</span></li>
    43                         <li><span class="facetvalue">Danish</span></li>
    44                         <li><span class="facetvalue">Japanese</span></li>
    45                         <li><span class="facetvalue">Turkish</span></li>
    46                         <li><span class="facetvalue">Chinese</span></li>
    47                         <!--<li class="more-link"><a href="#">more...</a></li>-->
    48                     </ul>
    49                 </div>
     26            <a href="#" class="expandfacet"><span>expand</span></a>
     27            <a href="#" class="collapsefacet"><span>collapse</span></a>
     28            <h1><a href="#"><wicket:container wicket:id="facet">[TITLE]</wicket:container></a></h1>
     29            <div wicket:id="facetValueRemover" class="selectedvaluelabel">
     30                <wicket:container wicket:id="facetValue">value</wicket:container>
     31                <a wicket:id="unselectValue" class="unselectfacetvalue" title="unselect value">
     32                    <span>[unselect]</span>
     33                </a>
     34            </div>
     35            <div class="sbilinks facetvalues">
     36                <ul>
     37                    <li><span class="selectedfacetvalue">Dutch</span><a class="unselectfacetvalue" title="unselect value" href="index2.html"><span>[unselect]</span></a></li>
     38                    <li><span class="facetvalue">English</span></li>
     39                    <li><span class="facetvalue">German</span></li>
     40                    <li><span class="facetvalue">French</span></li>
     41                    <li><span class="facetvalue">Spanish</span></li>
     42                    <li><span class="facetvalue">Danish</span></li>
     43                    <li><span class="facetvalue">Japanese</span></li>
     44                    <li><span class="facetvalue">Turkish</span></li>
     45                    <li><span class="facetvalue">Chinese</span></li>
     46                    <!--<li class="more-link"><a href="#">more...</a></li>-->
     47                </ul>
    5048            </div>
    5149        </wicket:panel>

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

    r4579 r4595  
    6262            </div>
    6363
    64             <div wicket:id="collectionsFacet">[COLLECTIONS]</div>
    65            
    66 <!--            <div class="topbar facet collapsedfacet" id="collections">
    67                 <div class="rtop"><div class="r1"></div><div class="r2"></div><div class="r3"></div><div class="r4"></div></div>
    68                 <a href="#" class="expandfacet"><span>expand</span></a>
    69                 <a href="#" class="collapsefacet"><span>collapse</span></a>
    70                 <h1><a href="#">Collections</a></h1>
    71                 <a class="filtertoggle" title="Filter values" href="#"><span>filter</span></a>
    72                 <form class="filterform">
    73                     <input type="text" />
    74                 </form>
    75                 <p>
    76                     Searching in all collections (604056 records). <a href="" id="showvalues">Select an individual collection.</a>
    77                 </p>
    78                 <div class="facetvalues">
    79                     <ul>
    80                         <li class="collection"><a href="">Meertens collection: Liederenbank (243129)</a></li>
    81                         <li class="collection"><a href="">UBU Clarin Set (69311)</a></li>
    82                         <li class="collection"><a href="">Nederlands Instituut voor Beeld en Geluid Academia collectie (46156)</a></li>
    83                         <li class="collection"><a href="">TLA: childes (29266)</a></li>
    84                         <li class="collection"><a href="">TLA: DoBeS archive (24722)</a></li>
    85                         <li class="collection"><a href="">TLA: Language and Cognition (23535)</a></li>
    86                         <li class="collection"><a href="">TLA: talkbank (14593)</a></li>
    87                         <li class="collection"><a href="">Bavarian Archive for Speech Signals (BAS) (14416)</a></li>
    88                         <li class="collection"><a href="">TLA: Acquisition (14363)</a></li>
    89                         <li class="collection"><a href="">Institut f&uuml;r Deutsche Sprache, CLARIN-D Zentrum, Mannheim (14320)</a></li>
    90                         <li class="collection"><a href="">Meertens collection: Liederenbank (243129)</a></li>
    91                         <li class="more-link"><a href="#">more...</a></li>
    92                     </ul>
    93                 </div>
    94                  rounded corners - bottom ****
    95                 <div class="rbottom"><div class="r4"></div><div class="r3"></div><div class="r2"></div><div class="r1"></div></div>
    96             </div>-->
     64            <div class="facet collapsedfacet topbar" wicket:id="collectionsFacet" id="collections">[COLLECTIONS]</div>
    9765
    9866            <div class="content">

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

    r4591 r4595  
    1515import java.util.Map;
    1616import org.apache.solr.client.solrj.response.FacetField;
     17import org.apache.wicket.behavior.AttributeAppender;
    1718import org.apache.wicket.request.mapper.parameter.PageParameters;
    1819import org.apache.wicket.markup.html.WebPage;
    … …  
    4950    }
    5051
     52    private Panel createCollectionsPanel(final String id, final Model<QueryFacetsSelection> queryModel) {
     53        final FacetFieldModel collectionFacetFieldModel = new FacetFieldModel(facetFieldsService, vloConfig.getCollectionFacet(), queryModel);
     54        final FacetSelectionModel collectionSelectionModel = new FacetSelectionModel(collectionFacetFieldModel, queryModel);
     55        final FacetPanel panel = new FacetPanel(id, collectionSelectionModel);
     56        return panel;
     57    }
     58
    5159    private Panel createFacetsPanel(final String id, final Model<QueryFacetsSelection> queryModel) {
    5260        final IModel<List<FacetField>> facetFieldsModel = new FacetFieldsModel(facetFieldsService, vloConfig.getFacetFields(), queryModel);
    5361        final FacetsPanel facetsPanel = new FacetsPanel(id, facetFieldsModel, queryModel);
    5462        return facetsPanel;
    55     }
    56 
    57     private Panel createCollectionsPanel(final String id, final Model<QueryFacetsSelection> queryModel) {
    58         final FacetFieldModel collectionFacetFieldModel = new FacetFieldModel(facetFieldsService, vloConfig.getCollectionFacet(), queryModel);
    59         final FacetSelectionModel collectionSelectionModel = new FacetSelectionModel(collectionFacetFieldModel, queryModel);
    60         final FacetPanel facetPanel = new FacetPanel(id, collectionSelectionModel);
    61         return facetPanel;
    6263    }
    6364
Note: See TracChangeset for help on using the changeset viewer.