[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository assetsearch.jsp contentsearch.jsp

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv30213

Modified Files:
        assetsearch.jsp contentsearch.jsp 
Log Message:
CMSC-1237    Asset: enable the type selector also for simple search


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-1237


Index: assetsearch.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- assetsearch.jsp     14 Jan 2009 09:57:14 -0000      1.19
+++ assetsearch.jsp     16 Jan 2009 07:06:25 -0000      1.20
@@ -102,8 +102,7 @@
             <table>
                <tr>
                   <td style="width:105px"><fmt:message key="searchform.title" 
/></td>
-                  <td colspan="5"><html:text property="title" 
style="width:200px"/></td>
-               <mm:compare referid="mode" value= "basic">
+                  <td style="width:300px"><html:text property="title" 
style="width:200px"/></td>
                   <td style="width:105px"><fmt:message 
key="searchform.assettype" /></td>
                   <td>
                     <c:if test="${not empty strict}">
@@ -116,24 +115,9 @@
                      </html:select>
                      </c:if>
                   </td>
-               </mm:compare>
                </tr>
              <mm:compare referid="mode" value= "advanced">
                <tr>
-                  <td style="width:105px"><fmt:message 
key="searchform.assettype" /></td>
-                  <td>
-                    <c:if test="${not empty strict}">
-                                       ${strict}
-                                       </c:if>
-                                       <c:if test="${empty strict}">
-                     <html:select property="assettypes" 
onchange="selectAssettype('${searchinit}');" >
-                        <html:option value="assetelement">&lt;<fmt:message 
key="searchform.assettypes.all" />&gt;</html:option>
-                        <html:optionsCollection name="typesList" value="value" 
label="label"/>
-                     </html:select>
-                     </c:if>
-                  </td>
-               </tr>
-                  <tr>
                      <td></td>
                      <td><b><fmt:message key="searchform.dates" /></b></td>
                      <td></td>
@@ -329,12 +313,12 @@
    <div style="padding-left:11px">
       <select name="assesMode" 
onchange="javascript:changeMode(${param.offset})">
          <c:if test="${empty searchShow || searchShow eq 'list'}">
-            <option id="a_list" selected="selected">list</option>
-            <option id = "a_thumbnail" >thumbnail</option>
+            <option id="a_list" selected="selected"><fmt:message 
key="asset.image.list"/></option>
+            <option id = "a_thumbnail" ><fmt:message 
key="asset.image.thumbnail"/></option>
          </c:if>
          <c:if test="${searchShow eq 'thumbnail'}">
-            <option id="a_list">list</option>
-            <option id = "a_thumbnail" selected="selected" >thumbnail</option>
+            <option id="a_list"><fmt:message key="asset.image.list"/></option>
+            <option id = "a_thumbnail" selected="selected" ><fmt:message 
key="asset.image.thumbnail"/></option>
          </c:if>
       </select>
    </div>


Index: contentsearch.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- contentsearch.jsp   14 Jan 2009 09:57:15 -0000      1.13
+++ contentsearch.jsp   16 Jan 2009 07:06:25 -0000      1.14
@@ -101,7 +101,7 @@
             <table>
                <tr>
                   <td style="width:105px"><fmt:message key="searchform.title" 
/></td>
-                  <td colspan="5"><html:text property="title" 
style="width:200px"/></td>
+                  <td style="width:300px"><html:text property="title" 
style="width:200px"/></td>
                <mm:compare referid="mode" value= "basic">
                   <td style="width:105px"><fmt:message 
key="searchform.contenttype" /></td>
                   <td>
@@ -115,7 +115,7 @@
              <mm:compare referid="mode" value= "advanced">
                <tr>
                   <td><fmt:message key="searchform.keywords" /></td>
-                  <td  colspan="3"><html:text property="keywords" 
style="width:200px"/></td>
+                  <td style="width:300px"><html:text property="keywords" 
style="width:200px"/></td>
                   <td style="width:105px"><fmt:message 
key="searchform.contenttype" /></td>
                   <td>
                      <html:select property="contenttypes" 
onchange="selectContenttype('${searchinit}');" >
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs