Author: kevinshen
Date: 2009-08-20 03:47:25 +0200 (Thu, 20 Aug 2009)
New Revision: 38050

Modified:
   
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/selectchannel.jsp
   
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
   
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/InsertImage/insertinline_image.html
Log:
CMSC-1443 Improve the fuction of searching asset.make them more consistent. 
improve the popup's style. it works with selecting a image from richtext 

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/selectchannel.jsp
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/selectchannel.jsp
       2009-08-20 01:36:55 UTC (rev 38049)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/selectchannel.jsp
       2009-08-20 01:47:25 UTC (rev 38050)
@@ -14,7 +14,7 @@
                </mm:cloud>
       <html:hidden property="contentChannel"/>
                <input type="text" name="contentChannelPath" 
value="${contentChannelPath}" disabled="true" style="width: 200px"/>   
-       <a style="margin-left:5px" href="<c:url 
value='/editors/repository/select/SelectorChannel.do?channel=${searchForm.contentChannel}'
 />" target="selectchannel"    onclick="openPopupWindow('selectchannel', 340, 
400)"> 
+       <a style="margin-left:5px" href="#" 
onclick="openPopupWindow('selectchannel', 340, 400,'<c:url 
value='/editors/repository/select/SelectorChannel.do?channel=${searchForm.contentChannel}'
 />')"> 
                        <fmt:message key="asset.search.selectchannel" />
                </a> 
       <img src="<cmsc:staticurl page='/editors/gfx/button_side_block.gif'/>" 
alt=""/>

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
 2009-08-20 01:36:55 UTC (rev 38049)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
 2009-08-20 01:47:25 UTC (rev 38050)
@@ -225,18 +225,18 @@
 <form name="inlineLinkForm" action="#">
   <input type="hidden" name="destination" id="f_destination" />
 
-<table border="0" style="padding: 0px; margin: 0px">
+<table border="0" style="padding: 0px; margin: 0px;width:80%">
   <tr>
     <td class="label">URL:</td>
-    <td><input type="text" id="f_href" style="width: 100%" readonly /></td>
+    <td><input type="text" id="f_href" style="width: 90%" readonly /></td>
   </tr>
   <tr>
     <td class="label">Title:</td>
-    <td><input type="text" id="f_title" style="width: 100%" /></td>
+    <td><input type="text" id="f_title" style="width: 90%" /></td>
   </tr>
   <tr>
     <td class="label">Tooltip:</td>
-    <td><input type="text" id="f_tooltip" style="width: 100%" /></td>
+    <td><input type="text" id="f_tooltip" style="width: 90%" /></td>
   </tr>
   <tr>
     <td class="label"><span id="f_target_label">Target:</span></td>

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/InsertImage/insertinline_image.html
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/InsertImage/insertinline_image.html
       2009-08-20 01:36:55 UTC (rev 38049)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/InsertImage/insertinline_image.html
       2009-08-20 01:47:25 UTC (rev 38050)
@@ -232,22 +232,22 @@
 <body  class="dialog" onload="Init()">
    <div class="title">Insert Image</div>
       <form name="inlineImageForm" action="" method="get">
-            <input type="hidden" name="destination" id="f_destination" />
-         <table border="0" style="padding: 0px; margin: 0px">
-              <tbody>
-                 <tr>
-                   <td style="width: 7em; text-align: right">Image URL:</td>
-                   <td>
-                        <input type="text" name="url" id="f_url" 
style="width:75%" readonly  />
-                        <button name="select" onclick="return onSelect();" 
title="Search for an image">Search</button>
-                   </td>
-                 </tr>
-                 <tr>
-                   <td style="width: 7em; text-align: right">Alternate 
text:</td>
-                   <td><input type="text" name="alt" id="f_alt" 
style="width:100%" title="For browsers that don't support images" /></td>
-                 </tr>
-              </tbody>
-         </table>
+                <input type="hidden" name="destination" id="f_destination" />
+                <table border="0" style="padding: 0px;margin: 0px;width:70%">
+                         <tbody>
+                                <tr>
+                                  <td style="width: 7em; text-align: 
right">Image URL:</td>
+                                  <td nowrap>
+                                               <input type="text" name="url" 
id="f_url" style="width:55%" readonly  />
+                                               <button name="select" 
onclick="return onSelect();" title="Search for an image">Search</button>
+                                  </td>
+                                </tr>
+                                <tr>
+                                  <td style="width: 7em; text-align: 
right">Alternate text:</td>
+                                  <td><input type="text" name="alt" id="f_alt" 
style="width:80%" title="For browsers that don't support images" /></td>
+                                </tr>
+                        </tbody>
+                </table>
 
          <fieldset style="float: left; margin-left: 5px;">
             <legend>Layout</legend>

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to