Changeset 1104

Timestamp:

12.07.2010 21:44:25 (19 months ago)

Author:

zmsdev

Message:

Revised search-template (sync default language-dict by saving language-settings!).

Location:

ZMS/trunk

Files:

• dtml/ZMS/f_bodycontent_search.dtml (modified) (10 diffs)
• dtml/object/f_css_defaults.dtml (modified) (2 diffs)
• import/_language.xml (modified) (6 diffs)

ZMS/trunk/dtml/ZMS/f_bodycontent_search.dtml

@@ -31 +31 @@
 </dtml-comment>
 <dtml-if "int(searchform)==1">
- <form action="<dtml-var URL>" method="get">
+
+<script type="text/javascript">
+$(function(){
+        pluginAutocomplete('#raw',function() {
+                $("#raw").autocomplete("getSearchTermFromLexicon", {
+                        width: $("#raw").css( "width"),
+                        selectFirst: false
+                });
+                $("#raw").result(function(event, data, formatted) {
+                        if (data) {
+                                $(this).parent().next().find("input").val(data[1]);
+                                $(this).parent().next().find("input").attr("form").submit();
+                        }
+                });
+        });
+});
+</script>
+
+ <form class="searchForm" action="<dtml-var URL>" method="get">
  <input type="hidden" name="searchform" value="<dtml-var searchform>">
-  <table border="0">
-  <tr valign="middle">
-   <td class="searchLabel" nowrap="nowrap"><dtml-var "getLangStr('ATTR_SEARCHTERM',lang)">:</td>
+  <table>
+  <colgroup>
+   <col width="20%"/>
+   <col width="80%"/>
+  </colgroup>
+  <tr valign="middle">
+   <td class="searchLabel"><dtml-var "getLangStr('ATTR_SEARCHTERM',lang)">:</td>
    <td class="searchElement">
-    <input class="form-element" type="text" name="raw" size="18"
-    <dtml-if "REQUEST.has_key('raw')">value="<dtml-var "REQUEST.get('raw').replace('<','')" html_quote>"</dtml-if>>
-   </td>
-   <td class="searchText" align="right" valign="top" rowspan="3">
-    <small><dtml-var "getLangStr('SEARCH_HINT',lang)"></small>
-   </td>
-  </tr>
-  <tr valign="middle">
-   <td class="searchLabel" nowrap="nowrap"><dtml-var "getLangStr('ATTR_OPTION',lang)">:</td>
+    <input class="searchInput" type="text" id="raw" name="raw" <dtml-if "REQUEST.has_key('raw')">value="<dtml-var "REQUEST.get('raw').replace('<','')" html_quote>"</dtml-if>>
+    <input class="searchSubmit" type="submit" name="btn" value="<dtml-var "getLangStr('BTN_SEARCH',lang)" html_quote>">
+   </td>
+  </tr>
+  <tr valign="middle">
+   <td class="searchLabel"><dtml-var "getLangStr('ATTR_OPTION',lang)">:</td>
    <td class="searchElement">
-    <select class="form-element" name="option">
+    <select name="option">
      <dtml-in "['AND','OR']">
       <option value="<dtml-var "_['sequence-item']">"
@@ -59 +78 @@
   </tr>
   <tr valign="middle">
-   <td class="searchLabel" nowrap="nowrap"><dtml-var "getLangStr('ATTR_ORDERBY',lang)">:</td>
+   <td class="searchLabel"><dtml-var "getLangStr('ATTR_ORDERBY',lang)">:</td>
    <td class="searchElement">
-    <select class="form-element" name="search_order_by:int">
+    <select name="search_order_by:int">
      <dtml-in "_.range(1,2+1)">
       <option value="<dtml-var sequence-item>"
@@ -74 +93 @@
   <dtml-if "getLevel()>0">
   <tr valign="middle">
-   <td class="searchLabel" nowrap="nowrap">&nbsp;</td>
+   <td class="searchLabel">&nbsp;</td>
    <td class="searchElement" colspan="2">
     <small>
@@ -87 +106 @@
    <dtml-if "getConfProperty('ZCatalog.portalClients',1) == 1 and len(portalClients)>0">
     <tr valign="middle">
-     <td class="searchLabel" nowrap="nowrap">&nbsp;</td>
+     <td class="searchLabel">&nbsp;</td>
      <td class="searchElement" colspan="2">
       <input type="hidden" name="search_clients:int" value="<dtml-var "REQUEST.get('search_clients',1)">">
@@ -96 +115 @@
    </dtml-if>
   </dtml-let>
-  <tr valign="middle">
-   <td class="searchLabel" nowrap="nowrap">&nbsp;</td>
-   <td class="searchElement" colspan="2">
-    <input class="searchSubmit" type="submit" name="btn" value="<dtml-var "getLangStr('BTN_SEARCH',lang)" html_quote>">
-   </td>
-  </tr>
   </table>
  </form>
@@ -150 +163 @@
  ></dtml-if>
 
- <h2><dtml-var "getLangStr('SEARCH_HEADERRESULT',lang)"></h2>
- <p><dtml-var "getLangStr('SEARCH_YOURQUERY',lang)%''"><strong><dtml-var "REQUEST.get('_s').replace('<','')" html_quote></strong> (<b><dtml-var "int((_.DateTime().timeTime()-qt)*100.0)/100.0"></b> sec.)</p>
-
  <dtml-if "len(res)==0">
  
-  <p><dtml-var "getLangStr('SEARCH_NORESULTS',lang)"></p>
+  <p class="searchHeader">
+   <dtml-var "getLangStr('SEARCH_NORESULTS',lang)">
+   (<dtml-var "int((DateTime().timeTime()-qt)*100.0)/100.0"> <dtml-var "getLangStr('SECONDS',lang)">)
+  </p>
   
  <dtml-else
@@ -172 +185 @@
   ></dtml-in>
 
-  <p><dtml-var "getLangStr('SEARCH_RETURNEDRESULTS',lang)">:</p>
-  <p><b><dtml-var "getLangStr('SEARCH_RETURNEDSTATS',lang)%(int(REQUEST.get('qs')),int(REQUEST.get('qe')),len(res))"></b></p>
+  <p class="searchHeader">
+   <dtml-var "getLangStr('SEARCH_RETURNEDSTATS',lang)%('<strong>%i</strong>'%int(REQUEST.get('qs')),'<strong>%i</strong>'%int(REQUEST.get('qe')),'<strong>%i</strong>'%len(res),'<strong>%s</strong>'%REQUEST.get('_s').replace('<',''))">
+   (<dtml-var "int((DateTime().timeTime()-qt)*100.0)/100.0"> <dtml-var "getLangStr('SECONDS',lang)">)
+  </p>
 
   <dtml-call "REQUEST.set('_u',getCatalogNavUrl(REQUEST))">
+  <dtml-call "REQUEST.set('_res',res)">
 
 <dtml-comment>
@@ -182 +198 @@
 --------------------------------------------------------------------------------
 </dtml-comment>
+<dtml-call "REQUEST.set('res',REQUEST['_res'])">
 <dtml-var search_nav_html>
 
@@ -190 +207 @@
 </dtml-comment>
 <dtml-in res size=10 start=qs mapping>
- <dtml-let ob="getCatalogPathObject( path)" title="ob.getTitle(REQUEST)" description="ob.getDCDescription(REQUEST)">
-   <p class="searchresult">
+ <dtml-let ob="getCatalogPathObject( path)" title="ob.getTitle(REQUEST)"
+  ><dtml-call "REQUEST.set('description',ob.getDCDescription(REQUEST))"
+  ><dtml-if "len(description)<=1"
+   ><dtml-call "REQUEST.set('description',ob.getBodyContent(REQUEST))"
+  ></dtml-if>
+   <p class="searchResult">
     <span class="title"><dtml-if "ob.meta_id=='ZMSFile'">
       <dtml-let f="ob.getObjProperty('file',REQUEST)">
@@ -224 +245 @@
 --------------------------------------------------------------------------------
 </dtml-comment>
+<dtml-call "REQUEST.set('res',REQUEST['_res'])">
 <dtml-var search_nav_html>
 

ZMS/trunk/dtml/object/f_css_defaults.dtml

@@ -6 +6 @@
  */
  
-body.print 
-        { 
+body.print {
         background-color:#fff; 
-        }
+}
 
 /* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -15 +14 @@
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
-.searchresult {
-margin-bottom:20px;
-}
-.searchresult span.title {
-display:block;
-font-weight:bold;
-color:#2200D5;
-}
-.searchresult span.title a {
-color:#2200D5;
-}
-.searchresult span.title a:visited {
-color:#91198B;
-}
-.searchresult span.description {
-display:block;
-}
-.searchresult span.linkpath {
-display:block;
-font-size:smaller;
-line-height:1.3em;
+.searchForm table {
+        width:100%;
+}
+.searchForm input {
+        border-top: 1px solid #CCC;
+        border-left: 1px solid #CCC;
+        border-right: 1px solid #AAA;
+        border-bottom: 1px solid #AAA;
+}
+.searchForm input.searchInput {
+        width:80%;
+}
+.searchHeader {
+        text-align:right;
+        border-top: 1px solid #CCC;
+        background-color: #EEE;
+        font-size:70%;
+}
+.searchResult {
+        margin-bottom:20px;
+}
+.searchResult span.title {
+        display:block;
+        font-weight:bold;
+        color:#2200D5;
+}
+.searchResult span.title a {
+        color:#2200D5;
+}
+.searchResult span.title a:visited {
+        color:#91198B;
+}
+.searchResult span.description {
+        display:block;
+}
+.searchResult span.linkpath {
+        display:block;
+        font-size:smaller;
+        line-height:1.3em;
 } 
-.searchresult span.linkpath a {
-color:#008000;
+.searchResult span.linkpath a {
+        color:#008000;
 }
 

ZMS/trunk/import/_language.xml

@@ -9 +9 @@
   <Created>2007-05-16T21:18:05Z</Created>
   <LastSaved>2008-11-26T15:34:08Z</LastSaved>
-  <Version>10.6847</Version>
+  <Version>10.6858</Version>
  </DocumentProperties>
  <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
@@ -135 +135 @@
  </Styles>
  <Worksheet ss:Name="_language.py">
-  <Table ss:ExpandedColumnCount="12" ss:ExpandedRowCount="474" x:FullColumns="1"
+  <Table ss:ExpandedColumnCount="12" ss:ExpandedRowCount="475" x:FullColumns="1"
    x:FullRows="1" ss:StyleID="s21" ss:DefaultColumnWidth="60">
    <Column ss:StyleID="s22" ss:AutoFitWidth="0" ss:Width="193.5"/>
@@ -5387 +5387 @@
     <Cell><Data ss:Type="String">Ngà y tháng</Data></Cell>
    </Row>
-   <Row ss:AutoFitHeight="0" ss:Height="25.5">
+   <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="String">SEARCH_RETURNEDRESULTS</Data></Cell>
     <Cell><Data ss:Type="String">erzielte folgende Ergebnisse</Data></Cell>
@@ -5400 +5400 @@
     <Cell><Data ss:Type="String">trả về các kết quả sau</Data></Cell>
    </Row>
-   <Row ss:AutoFitHeight="0" ss:Height="25.5">
+   <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="String">SEARCH_RETURNEDSTATS</Data></Cell>
-    <Cell><Data ss:Type="String">Dokument %i - %i von %i Treffern</Data></Cell>
-    <Cell><Data ss:Type="String">Documents %i - %i of %i matches</Data></Cell>
-    <Cell ss:Index="5"><Data ss:Type="String">Documento %i - %i da %i</Data></Cell>
-    <Cell ss:Index="7"><Data ss:Type="String">列出 %i 到 %i å
-± %i 濡件</Data></Cell>
+    <Cell><Data ss:Type="String">Ergebnisse %s - %s von %s fÃŒr %s</Data></Cell>
+    <Cell><Data ss:Type="String">Results %s - %s of %s for %s</Data></Cell>
+    <Cell ss:Index="5"><Data ss:Type="String">Risultati %s - %s da %s di %s</Data></Cell>
+    <Cell ss:Index="7"><Data ss:Type="String">列出 %s 到 %iså
+± %s 件 %s</Data></Cell>
     <Cell ss:StyleID="s26"><Data ss:Type="String">سند %i از يافته ها</Data></Cell>
-    <Cell ss:StyleID="s27"><Data ss:Type="String">ЎПкуЌеМт %i - %i ОЌеет %i пПпаЎаМОй</Data></Cell>
-    <Cell ss:StyleID="s28"><Data ss:Type="String">à€•à€Ÿà€—à¥›à€Ÿà€€ %i - %i à€•à€Ÿ %i à€žà€®à€Ÿà€š</Data></Cell>
+    <Cell ss:StyleID="s27"><Data ss:Type="String">результаты %s - %s ОЌеет %s пПпаЎаМОй %s</Data></Cell>
+    <Cell ss:StyleID="s28"><Data ss:Type="String">à€•à€Ÿà€—à¥›à€Ÿà€€ %s - %s à€•à€Ÿ %s à€žà€®à€Ÿà€š %s</Data></Cell>
     <Cell ss:StyleID="s28"><Data ss:Type="String">الÙ
 ستندات  %i - i % Ù
 ن %i تتطاؚق</Data></Cell>
-    <Cell><Data ss:Type="String">Các tà i liệu %i - %i của %i phù hợp</Data></Cell>
+    <Cell><Data ss:Type="String">Các tà i liệu %s - %s của %s phù hợp %s</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="String">SECONDS</Data></Cell>
+    <Cell><Data ss:Type="String">Sekunden</Data></Cell>
+    <Cell><Data ss:Type="String">seconds</Data></Cell>
+    <Cell ss:Index="8" ss:StyleID="s26"/>
+    <Cell ss:StyleID="s27"/>
+    <Cell ss:StyleID="s28"/>
+    <Cell ss:StyleID="s28"/>
    </Row>
    <Row>
@@ -5427 +5436 @@
     <Cell><Data ss:Type="String">Tìm kiếm của bạn cho:'%s'</Data></Cell>
    </Row>
-   <Row ss:AutoFitHeight="0" ss:Height="25.5">
+   <Row ss:AutoFitHeight="0">
     <Cell><Data ss:Type="String">SHORTDATETIME_FMT</Data></Cell>
     <Cell><Data ss:Type="String">%d.%m.%y %H:%M:%S</Data></Cell>
@@ -6708 +6717 @@
    <Zoom>75</Zoom>
    <Selected/>
-   <TopRowVisible>57</TopRowVisible>
+   <TopRowVisible>351</TopRowVisible>
+   <LeftColumnVisible>7</LeftColumnVisible>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveRow>379</ActiveRow>
+     <ActiveCol>9</ActiveCol>
+    </Pane>
+   </Panes>
    <ProtectObjects>False</ProtectObjects>
    <ProtectScenarios>False</ProtectScenarios>