Author: shinichiro
Date: Tue Jan 28 02:32:31 2014
New Revision: 1561928
URL: http://svn.apache.org/r1561928
Log:
Fix for CONNECTORS-870
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1561928&r1=1561927&r2=1561928&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jan 28 02:32:31 2014
@@ -3,6 +3,10 @@ $Id$
======================= 1.6-dev =====================
+CONNECTORS-870: Avoid line break for login.jsp description
+when locale is Japanese.
+(Shinichiro Abe)
+
CONNECTORS-868: Remove mvn-bootstrap scripts and all mention of them.
Direct dependencies on missing artifacts are now possible.
(Muhammed Olgun)
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp?rev=1561928&r1=1561927&r2=1561928&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp Tue Jan 28
02:32:31 2014
@@ -62,13 +62,13 @@ if (value != null && value.equals("true"
}
%>
<tr>
- <td
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%></td>
+ <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%></nobr></td>
<td
class="value">
<input
name="userID" type="text" size="32" value=""/>
</td>
</tr>
<tr>
- <td
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%></td>
+ <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%></nobr></td>
<td
class="value">
<input
name="password" type="password" size="32" value=""/>
</td>
