1070083 - Login page is not localized.

kiegroup · Mar 7, 2014 · 01504d2 · 01504d2
1 parent 430d66d
commit 01504d2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 28 deletions.
diff --git a/kie-drools-wb/kie-drools-wb-webapp/src/main/webapp/login.jsp b/kie-drools-wb/kie-drools-wb-webapp/src/main/webapp/login.jsp
@@ -152,24 +152,14 @@
 
     <form action="j_security_check" method="POST">
       <p>
-<<<<<<< HEAD
-        <label><i18n:message key="UserName">Username</i18n:message></label>
-        <input value="" name="j_username" class="text-input" type="text"/>
-=======
-        <label style="white-space: nowrap;"><i18n:message key="UserName">Username</i18n:message></label>
-        <input value="" name="uf_username" class="text-input" type="text"/>
->>>>>>> f64caed... BZ:1070083 - Login page is not localized.
+          <label style="white-space: nowrap;"><i18n:message key="UserName">Username</i18n:message></label>
+          <input value="" name="j_username" class="text-input" type="text"/>
       </p>
       <br style="clear: both;"/>
 
       <p>
-<<<<<<< HEAD
-        <label><i18n:message key="Password">Password</i18n:message></label>
-        <input name="j_password" class="text-input" type="password"/>
-=======
-        <label style="white-space: nowrap;"><i18n:message key="Password">Password</i18n:message></label>
-        <input name="uf_password" class="text-input" type="password"/>
->>>>>>> f64caed... BZ:1070083 - Login page is not localized.
+          <label style="white-space: nowrap;"><i18n:message key="Password">Password</i18n:message></label>
+          <input name="j_password" class="text-input" type="password"/>
       </p>
       <br style="clear: both;"/>
 

diff --git a/kie-wb/kie-wb-webapp/src/main/webapp/login.jsp b/kie-wb/kie-wb-webapp/src/main/webapp/login.jsp
@@ -151,24 +151,14 @@
     </c:if>
     <form action="j_security_check" method="POST">
       <p>
-<<<<<<< HEAD
-          <label><i18n:message key="UserName">Username</i18n:message></label>
-        <input value="" name="j_username" class="text-input" type="text"/>
-=======
-        <label style="white-space: nowrap;"><i18n:message key="UserName">Username</i18n:message></label>
-        <input value="" name="uf_username" class="text-input" type="text"/>
->>>>>>> f64caed... BZ:1070083 - Login page is not localized.
+          <label style="white-space: nowrap;"><i18n:message key="UserName">Username</i18n:message></label>
+          <input value="" name="j_username" class="text-input" type="text"/>
       </p>
       <br style="clear: both;"/>
 
       <p>
-<<<<<<< HEAD
-        <label><i18n:message key="Password">Password</i18n:message></label>
-        <input name="j_password" class="text-input" type="password"/>
-=======
-        <label style="white-space: nowrap;"><i18n:message key="Password">Password</i18n:message></label>
-        <input name="uf_password" class="text-input" type="password"/>
->>>>>>> f64caed... BZ:1070083 - Login page is not localized.
+          <label style="white-space: nowrap;"><i18n:message key="Password">Password</i18n:message></label>
+          <input name="j_password" class="text-input" type="password"/>
       </p>
       <br style="clear: both;"/>