Changeset 5532


Ignore:
Timestamp:
08/07/14 09:51:55 (10 years ago)
Author:
Twan Goosen
Message:

Fixed constraints on resource label and description. Updated view accordingly.
Fixes #608

Location:
VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/EditResourceDialog$Content.html

    r5531 r5532  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    3                       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
     3    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    44<html xmlns="http://www.w3.org/1999/xhtml"
    55      xmlns:wicket="http://wicket.apache.org/">
    6 <head />
    7 <body>
    8 <wicket:panel>
    9 <form wicket:id="editResourceForm">
    10   <fieldset>
    11     <div class="required">
    12       <label id="typelabel" class="tooltipparent" for="edit_resource_type">Type
    13           <span class="tooltip">
    14               Type of reference<br /><br />
    15               Metadata: the referenced item is a CMDI metadata document that
    16               <em>describes</em> one or more resources<br /><br />
    17               Resource: the reference item is a resource that can be accessed
    18               directly through the specified URI
    19           </span>
    20       </label>
    21       <select wicket:id="type" id="edit_resource_type"></select>
    22     </div>
    23     <div class="required">
    24       <label id="referencelabel" class="tooltipparent" for="edit_resource_ref">Reference
    25           <span class="tooltip">
    26               A PID or other type or URI identifying or locating the resource
    27               or metadata file
    28           </span>
    29       </label>
    30       <input wicket:id="ref" id="edit_resource_ref" type="text" />
    31     </div>
    32     <div class="optional">
    33       <label id="labellabel" class="tooltipparent" for="edit_resource_label">Label
    34           <span class="tooltip">
    35               An optional label for this reference providing a short description
    36               of the item, to be shown instead of or in addition to the URI
    37           </span>
    38       </label>
    39       <input wicket:id="label" id="edit_resource_label" type="text" />
    40     </div>
    41     <div class="optional">
    42       <label id="descriptionlabel" class="tooltipparent" for="edit_resource_description">Description
    43           <span class="tooltip">
    44               An optional, more detailed description of the referenced item
    45           </span>
    46       </label>
    47       <input wicket:id="description" id="edit_resource_description" type="text" />
    48     </div>
    49   </fieldset>
    50   <div wicket:id="feedback" class="feedback"></div>
    51 </form>
    52 </wicket:panel>
    53 </body>
     6    <head />
     7    <body>
     8        <wicket:panel>
     9            <form wicket:id="editResourceForm">
     10                <fieldset>
     11                    <div class="required">
     12                        <label id="typelabel" class="tooltipparent" for="edit_resource_type">Type
     13                            <span class="tooltip">
     14                                Type of reference<br /><br />
     15                                Metadata: the referenced item is a CMDI metadata document that
     16                                <em>describes</em> one or more resources<br /><br />
     17                                Resource: the reference item is a resource that can be accessed
     18                                directly through the specified URI
     19                            </span>
     20                        </label>
     21                        <select wicket:id="type" id="edit_resource_type"></select>
     22                    </div>
     23                    <div class="required">
     24                        <label id="referencelabel" class="tooltipparent" for="edit_resource_ref">Reference
     25                            <span class="tooltip">
     26                                A PID or other type or URI identifying or locating the resource
     27                                or metadata file
     28                            </span>
     29                        </label>
     30                        <input wicket:id="ref" id="edit_resource_ref" type="text" />
     31                    </div>
     32                    <div class="optional">
     33                        <label id="labellabel" class="tooltipparent" for="edit_resource_label">Label
     34                            <span class="tooltip">
     35                                An optional label for this reference providing a short description
     36                                of the item, to be shown instead of or in addition to the URI
     37                            </span>
     38                        </label>
     39                        <input wicket:id="label" id="edit_resource_label" type="text" />
     40                    </div>
     41                    <div class="optional">
     42                        <label id="descriptionlabel" class="tooltipparent" for="edit_resource_description">Description
     43                            <span class="tooltip">
     44                                An optional, more detailed description of the referenced item
     45                            </span>
     46                        </label>
     47                        <textarea wicket:id="description"
     48                                  id="edit_resource_description" cols="80" rows="8"></textarea>
     49                    </div>
     50                </fieldset>
     51                <div wicket:id="feedback" class="feedback"></div>
     52            </form>
     53        </wicket:panel>
     54    </body>
    5455</html>
  • VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/EditResourceDialog.java

    r5491 r5532  
    1717import eu.clarin.cmdi.virtualcollectionregistry.gui.dialog.ModalEditDialogBase;
    1818import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
     19import org.apache.wicket.markup.html.form.TextArea;
    1920
    2021@SuppressWarnings("serial")
     
    4142                    .add(new UrlValidator(UrlValidator.NO_FRAGMENTS)));
    4243           
    43             form.add(new TextField<String>("label"));
    44             form.add(new TextField<String>("description"));
     44            form.add(new TextField<String>("label")
     45                    .add(new StringValidator.MaximumLengthValidator(255)));
     46           
     47            form.add(new TextArea<String>("description"));
    4548           
    4649            feedbackPanel = new FeedbackPanel("feedback");
  • VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/Resource.java

    r5491 r5532  
    1010import javax.persistence.GenerationType;
    1111import javax.persistence.Id;
     12import javax.persistence.Lob;
    1213import javax.persistence.Table;
    1314
     
    3940    private String ref;
    4041   
    41     @Column(name = "label", nullable = true)
     42    @Column(name = "label", nullable = true, length = 255)
    4243    private String label;
    4344   
    44     @Column(name = "description", nullable = true)
     45    @Lob
     46    @Column(name = "description", length = 8192)
    4547    private String description;
    4648   
  • VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/css/vcr.css

    r5531 r5532  
    628628    padding: 2px;
    629629    text-align: left;
     630    vertical-align: top;
    630631}
    631632
Note: See TracChangeset for help on using the changeset viewer.