Changeset 6692 for trunk/www/common/annotations/inherit.jsp

Timestamp:

Jan 21, 2015, 3:42:04 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1911: Quick-filter in edit inherited annotations dialog

File:

• trunk/www/common/annotations/inherit.jsp (modified) (2 diffs)

trunk/www/common/annotations/inherit.jsp

@@ -299 +299 @@
     <div class="absolutefull bg-filled-100 rightborder" style="width: 28em;">
     
-      <div class="absolutefull parameterlist" style="bottom: 3em;">
+      <div class="absolutefull bottomborder" style="height: 2em;">
+      <%
+      if (parentAnnotations.size() > 0) 
+      {
+        %>
+        <table style="width: 100%;">
+        <tr>
+          <td style="padding-left: 4px; padding-right: 4px;"><base:icon image="filter.png"/></td>
+          <td style="width: 100%; padding-top: 1px;">
+            <input type="text" name="quickFilter" id="quickFilter" 
+              class="auto-init" data-auto-init="focus"
+              style="width: calc(100% - 10px);"
+              title="Type to filter annotation types">
+          </td>
+        </table>
+        <%
+      }
+      %>
+      </div>
+      <div class="absolutefull parameterlist" style="top: 2em; bottom: 3em;">
         <div id="joust" class="joust absolutefull"
           data-joust-tree="<%=HTML.encodeTags(json.toJSONString()) %>"
@@ -307 +326 @@
           {
             %>
-            <div class="messagecontainer error">There are no parent items with annotations.</div>
+            <div class="messagecontainer error" style="margin: 2em;">There are no parent items with annotations.</div>
             <%
           }
           %>
+          <div id="noMatchingFilter" class="messagecontainer error" style="margin: 2em; display: none;">No annotations matches the filter.</div>
         </div>
       </div>