search results are much prettier

diff --git a/etc/bundles/open_en.properties b/etc/bundles/open_en.properties
index ff79596..7fa6bac 100755 (executable)
--- a/etc/bundles/open_en.properties
+++ b/etc/bundles/open_en.properties
@@ -1,6 +1,7 @@
 ########## open posting ##########
 # language: english
 
+langcode=en
 optional=optional
 required=required
 
@@ -80,4 +81,33 @@ postingdupe.htmltitle=open posting - duplicate posting
 postingdupe.title=Stay calm. Things will happen soon.
 postingdupe.explanation=You probably clicked on the reload button or submitted your posting a second time. The fact that you can read this text means that your posting has been recieved and will soon be included in the article page.<br>
 postingdupe.no_panic=Don't panic
-postingdupe.back=Back
\ No newline at end of file
+postingdupe.back=Back
+
+search.info=Results of your search:
+search.title=SEARCH
+search.htmltitle=MirSearch (powered by lucene)
+search.mainsearchfield=Search for the following in title,content, or description: 
+search.searchbutton=Search!
+search.refine=Refine your search:
+search.all_or_any=all words or any of the words?
+search.all=all words
+search.any=any of the words
+search.by_author=search for articles written by:
+search.by_topic=search in the following topic only:
+search.all_topics=All topics
+search.with_images=only return content with images?
+search.with_audio=only return content with audio?
+search.with_video=only return content with video?
+search.yes=yes
+search.no=no
+search.sort_how=Sort results how?
+search.by_score=By score
+search.old_first=Newest first
+search.new_first=Oldest first
+search.back=Back
+search.forward=Forward
+search.numhits=Number of hits 
+search.result.title=Title:
+search.result.author=Author:
+search.result.date=Date:
+search.result.description=Description:

diff --git a/etc/open/search_results.template b/etc/open/search_results.template
index 61dc957..f6579e8 100755 (executable)
--- a/etc/open/search_results.template
+++ b/etc/open/search_results.template
@@ -17,104 +17,139 @@
 
 <form method="get" action="/Mir/servlet/OpenMir">
 <input type="hidden" name="do" value="search"/>
-<h2>Search for the following in title,content, or description:</h2>
-<input type="text" name="search_content" value="${data.search_content}" /><br><br>
-
-<h2>all words or any of the words?</h2>
-<if data.search_boolean == "and">
-<input type="radio" name="search_boolean" value="and" checked="true">all words
-<input type="radio" name="search_boolean" value="or">any of the words
-<else>
-<input type="radio" name="search_boolean" value="and">all words
-<input type="radio" name="search_boolean" value="or" checked="true">any of the words
-</if>
-
-<h2>Search for articles written by:</h2>
-<input type="text" name="search_creator" value="${data.search_creator}" /><br><br>
-
-<h2>Search in the following topic only:</h2>
-<select name="search_topic">
-<if (!data.search_topic) || (data.search_topic == "") >
-<option value="" selected>All topics
-<else>
-<option value="">All topics
-</if>
-<list data.topics as topic>
-<if topic.value != "--" >
-<if data.search_topic == topic.value>
-<option selected>${topic.value}
-<else>
-<option>${topic.value}
-</if>
-</if>
-</list>
-</select>
-
-<h2>only return content with images?</h2>
-<if data.search_hasImages == "y">
-<input type="radio" name="search_hasImages" value="y" checked="true">Yes
-<input type="radio" name="search_hasImages" value="n">No
-<else>
-<input type="radio" name="search_hasImages" value="y">Yes
-<input type="radio" name="search_hasImages" value="n" checked="true">No
-</if>
-
-<h2>only return content with audio?</h2>
-<if data.search_hasAudio == "y">
-<input type="radio" name="search_hasAudio" value="y" checked="true">Yes
-<input type="radio" name="search_hasAudio" value="n">No
-<else>
-<input type="radio" name="search_hasAudio" value="y">Yes
-<input type="radio" name="search_hasAudio" value="n" checked="true">No
-</if>
-
-<h2>only return content with video?</h2>
-<if data.search_hasVideo == "y">
-<input type="radio" name="search_hasVideo" value="y" checked="true">Yes
-<input type="radio" name="search_hasVideo" value="n">No
-<else>
-<input type="radio" name="search_hasVideo" value="y">Yes
-<input type="radio" name="search_hasVideo" value="n" checked="true">No
-</if>
-<h2>how would you like the results sorted?</h2>
-<input type="radio" name="search_sort" value="score" <if data.search_sort =="score" || !data.search_sort || data.search_sort == "" >checked="true"</if>>By score
-<input type="radio" name="search_sort" value="date_desc" <if data.search_sort =="date_desc">checked="true"</if>>Newest first
-<input type="radio" name="search_sort" value="date_asc" <if data.search_sort =="date_asc">checked="true"</if>>Oldest first
-
-
+<center>
+  <b>${lang("search.mainsearchfield")}</b><br>
+  <input type="text" size="40" name="search_content" value="${data.search_content}" /><input type="submit" name="search_submit" value="${lang("search.searchbutton")}" />
+</center>
+<br>
+<b>${lang("search.refine")}</b><br>
+<table>
+  <tr>
+    <td><b>${lang("search.all_or_any")}</b></td>
+    <td>
+      <if data.search_boolean == "and">
+        <input type="radio" name="search_boolean" value="and" checked="true">${lang("search.all")}
+        <input type="radio" name="search_boolean" value="or">${lang("search.any")}
+      <else>
+        <input type="radio" name="search_boolean" value="and">${lang("search.all")}
+        <input type="radio" name="search_boolean" value="or" checked="true">${lang("search.any")}
+      </if>
+    </td>
+  </tr> 
+  <tr>
+    <td><b>${lang("search.by_author")}</b></td>
+    <td>
+      <input type="text" name="search_creator" value="${data.search_creator}" />
+    </td>
+  </tr>
+  <tr>
+    <td><b>${lang("search.by_topic")}</b></td>
+    <td>
+      <select name="search_topic">
+        <if (!data.search_topic) || (data.search_topic == "") >
+          <option value="" selected>${lang("search.all_topics")}
+        <else>
+          <option value="">${lang("search.all_topics")}
+        </if>
+        <list data.topics as topic>
+          <if topic.value != "--" >
+            <if data.search_topic == topic.value>
+              <option selected>${topic.value}
+            <else>
+              <option>${topic.value}
+            </if>
+          </if>
+        </list>
+      </select>
+    </td>
+  </tr>
+</table>
+<table>
+  <tr>
+    <td><b>${lang("search.with_images")}</b></td>
+    <td>
+      <if data.search_hasImages == "y">
+        <input type="radio" name="search_hasImages" value="y" checked="true">${lang("search.yes")}
+        <input type="radio" name="search_hasImages" value="n">${lang("search.no")}
+      <else>
+        <input type="radio" name="search_hasImages" value="y">${lang("search.yes")}
+        <input type="radio" name="search_hasImages" value="n" checked="true">${lang("search.no")}
+      </if>
+    </td>
+  </tr>
+  <tr>
+    <td><b>${lang("search.with_audio")}</b></td>
+    <td>
+      <if data.search_hasAudio == "y">
+        <input type="radio" name="search_hasAudio" value="y" checked="true">${lang("search.yes")}
+        <input type="radio" name="search_hasAudio" value="n">${lang("search.no")}
+      <else>
+        <input type="radio" name="search_hasAudio" value="y">${lang("search.yes")}
+        <input type="radio" name="search_hasAudio" value="n" checked="true">${lang("search.no")}
+      </if>
+    </td>
+  </tr>
+  <tr>
+    <td><b>${lang("search.with_video")}</b></td>
+    <td>
+      <if data.search_hasVideo == "y">
+        <input type="radio" name="search_hasVideo" value="y" checked="true">${lang("search.yes")}
+        <input type="radio" name="search_hasVideo" value="n">${lang("search.no")}
+      <else>
+        <input type="radio" name="search_hasVideo" value="y">${lang("search.yes")}
+        <input type="radio" name="search_hasVideo" value="n" checked="true">${lang("search.no")}
+      </if>
+    </td>
+  </tr>
+</table>
 
+<b>${lang("search.sort_how")}</b>
+<input type="radio" name="search_sort" value="score" <if data.search_sort =="score" || !data.search_sort || data.search_sort == "" >checked="true"</if>>${lang("search.by_score")}
+<input type="radio" name="search_sort" value="date_desc" <if data.search_sort =="date_desc">checked="true"</if>>${lang("search.new_first")}
+<input type="radio" name="search_sort" value="date_asc" <if data.search_sort =="date_asc">checked="true"</if>>${lang("search.old_first")}
+<input type="submit" name="search_submit" value="${lang("search.searchbutton")}" />
 <br>
-<input type="submit" name="search_submit" value="Search!" />
-Previous Lucene Query was: ${data.queryString} <br>
+<if data.queryString>
+<!--Lucene Query was: ${data.queryString} <br>-->
+<hr>
 <if data.hasPrevious=="y">     
-<input type="submit" name="search_submit" value="Back" />      
+<input type="submit" name="search_submit" value="${lang("search.back")}" />    
 </if>
 <if data.hasNext=="y"> 
-<input type="submit" name="search_submit" value="Forward" />   
+<input type="submit" name="search_submit" value="${lang("search.forward")}" /> 
 </if>
 </form>
-
 <br>
-${lang("search.info")}
+<b>${lang("search.info")}</b>
 <br>
-Number of hits = ${data.numberOfHits}
+<b>${lang("search.numhits")} = ${data.numberOfHits}</b>
 <br>
-<list data.hits as h>
-Title: <a href='/${lang("langcode")}${h.where}'>${h.title}</a> 
-<if h.hasAudio=="y">
-<img src="/img/audio_big.gif">
-</if>
-<if h.hasVideo == "y">
-<img src="/img/video_big.gif">
-</if>
-<br >
-Author: ${h.creator}<br >
-Date: ${h.webdb_create_formatted}<br>
-Description: ${h.description}<br >
-<list h.images as image>
-<img src="${image}">
-</list>
 <br>
+</if>
+<list data.hits as h>
+  <table>
+    <tr>
+      <td>
+        ${lang("search.result.title")} <a href='/${lang("langcode")}${h.where}'>${h.title}</a> 
+        <if h.hasAudio=="y">
+          <img src="/img/audio_big.gif">
+        </if>
+        <if h.hasVideo == "y">
+          <img src="/img/video_big.gif">
+        </if>
+        <br>
+        ${lang("search.result.author")} ${h.creator}<br >
+        ${lang("search.result.date")} ${h.webdb_create_formatted}<br>
+        ${lang("search.result.description")} ${h.description} <br>
+      </td>
+      <td>
+        <list h.images as image>
+          <img src="${image}">
+        </list>
+      </td>
+    </tr>
+  </table>
+  <br>
 </list>
        </font>
        </td>
@@ -122,7 +157,7 @@ Description: ${h.description}<br >
 
 <tr>
        <td valign="top" align="center" bgcolor="#666666">
-       <a href="javascript:history.go(-2)"><font color="White"><b>&gt;&gt; ${lang("postingdone.back")}</b></font></a>
+       <a href="/"><font color="White"><b>&gt;&gt; ${lang("postingdone.back")}</b></font></a>
                </td>
        </tr>
 </table>