Changeset 292

Timestamp:

05/19/08 22:41:59 (8 months ago)

Author:

chris

Message:

Fix transliteration table on search page.

Files:

• lex/trunk/jsp/search.jsp (modified) (3 diffs)
• lex/trunk/test/com/qwirx/lex/SearchTest.java (modified) (6 diffs)

lex/trunk/jsp/search.jsp

@@ -144 +144 @@
-                from the set:
-        </p>
-        <%
-                String latin  = ">BGDHWZXVJKLMNS<PYQRFCT";
-                String hebrew = HebrewConverter.toHebrew(latin);
-                String trans  = HebrewConverter.toTranslit(latin);
-        %>
-        <table class="grid">
-                <tr>
-                        <th>Consonants</th>
-                        <%
+                                String latin  = ">BGDHWZXVJKLMNS<PYQRFCT";
+                                
-                                for (int i = 0; i < latin.length()      ; i++)
-                                {
@@ -165 +162 @@
-                        <th>Hebrew</th>
-                        <%
-hebrew.length()
+latin.length()     
-                                {
-
+
+
-                                        %>
-c
+h
-                                        <%
-                                }
@@ -177 +175 @@
-                        <th>Transliteration</th>
-                        <%
-trans.length()
+latin.length()     
-                                {
-
+
+
-                                        %>
-c
+h
-                                        <%
-                                }

lex/trunk/test/com/qwirx/lex/SearchTest.java

@@ -235 +235 @@
-        i.assertStart("h1");
-        i.assertText("Lex");
-font
+span
-            new Attributes().style("font-size: medium"));
-        i.assertText("by");
-        i.assertSimple("a", "Chris Wilson", 
-            new Attributes().href("http://www.qwirx.com"));
-font
+span
-        i.assertEnd("h1");
-        
@@ -270 +270 @@
-            new Attributes().clazz("dump_jsp").href("dump.jsp"));
-        */
+        i.assertSimple("a", "Wordnet", 
+            new Attributes().clazz("wordnet_jsp").href("wordnet.jsp"));
-        i.assertSimple("a", "Login", 
-            new Attributes().clazz("login_jsp").href("login.jsp?next=search.jsp"));
@@ -278 +280 @@
-        
-        i.assertStart("form", new Attributes().method("GET").clazz("bigborder"));
-earch for Hebrew word by root
-(surface consonants
+imple search (enter surface consonants
+for a Hebrew word
-        i.assertStart("p");
-        i.assertEmpty("input", new Attributes().name("q"));
-        i.assertEmpty("input", new Attributes().type("submit").value("Search"));
-        i.assertEnd("p");
+        
+        i.assertEmpty("hr");
+        
+        i.assertSimple("p", "Advanced search (enter an MQL query to nest " +
+            "within [clause]):"); 
+        i.assertStart("p");
+        i.assertEmpty("input", new Attributes().name("aq").add("size", "40"));
+        i.assertSubmit("advanced", "Search");
+        i.assertEnd("p");
+        
+        i.assertEmpty("hr");
+        
+        i.assertStart("div", 
+            new Attributes().add("id", "simple_adv_div").clazz("advanced"));
+        
-        i.assertStart("p");
-        i.assertEmpty("input", new Attributes().type("checkbox")
@@ -320 +337 @@
-        i.assertStart("tr");
-        i.assertSimple("th", "Hebrew");
-
-
-
-
+
+
+
+
+
-        }
-        i.assertEnd("tr");
@@ -329 +347 @@
-        i.assertStart("tr");
-        i.assertSimple("th", "Transliteration");
-
-
-
-
+
+
+
+
+
-        }
-        i.assertEnd("tr");
-
-        i.assertEnd("table");
+        i.assertEnd("div", new Attributes().clazz("advanced"));
+        
+        i.assertStart("div");
+        i.assertInput("simple_adv_btn", "Advanced Options ")
+            .assertAttribute("type", "button")
+            .assertAttribute("onclick", "toggle(this, 'simple_adv_div')");
+        i.assertEnd("div");
-        i.assertEnd("form");
-        
@@ -346 +372 @@
-        i.assertSimple("a", "Lex Project", 
-            new Attributes().href("http://rrg.qwirx.com/trac/lex"));
-7
+8
-        i.assertEnd("p");
-        i.assertEnd("body");