Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Final fix to Client Side Registration page

  • Loading branch information...
commit 4d0a6d020063083d1265307275a73ad86313f2e1 1 parent f1edc60
Sam Richard authored

Showing 1 changed file with 0 additions and 48 deletions. Show diff stats Hide diff stats

  1. +0 48 src/main/webapp/jsp/external/register.jsp
48 src/main/webapp/jsp/external/register.jsp
@@ -39,7 +39,6 @@
39 39 <div id="edit_form_field" > <!-- style="float:left" -->
40 40
41 41 <form id="external_registration" name="external_registration" method="post" action="#">
42   -<<<<<<< HEAD
43 42
44 43 <table>
45 44 <tbody>
@@ -121,55 +120,8 @@
121 120 </tr>
122 121 </tbody>
123 122 </table>
124   -=======
125   -
126   - <!--Email Address-->
127   - <label class="external_input"for="email">Email Address</label>
128   - <input id="email" name="email" type="text" value="<%=email != null ? email : "" %>" size="31" maxlength="255" tabindex="1" style="margin-left:34px;"/>
129   - <br />
130   -
131   - <!--Verify Email Address-->
132   - <label class="external_input"for="email_verify">Verify Email Address</label>
133   - <input id="email_verify" name="email_verify" type="text" value="<%=email != null ? email : "" %>" value="" size="31" maxlength="255" tabindex="2" style="margin-left:-11px;"/>
134   - <br />
135   -
136   - <!--First Name-->
137   - <label class="external_input"for="firstname">First Name</label>
138   - <input id="firstname" name="firstname" type="text" value="<%=firstName != null ? firstName : "" %>" size="31" maxlength="255" tabindex="3" style="margin-left:-3px;"/ >
139   - <br />
140   -
141   - <!--Last Name-->
142   - <label class="external_input"for="lastname">Last Name</label>
143   - <input id="lastname" name="lastname" type="text" value="<%=lastName != null ? lastName : "" %>" size="31" maxlength="255" tabindex="4" style="margin-left:-2px;"/>
144   - <br />
145   -
146   - <!--Phone Number-->
147   - <label class="external_input"for="phone">Phone Number</label>
148   - <input id="phone" name="phone" type="text" value="<%= phone != null ? phone : "(###) ###-####" %>" style="margin-left:30px;" size="31" maxlength="255" tabindex="5" style="margin-left:30px;"/>
149   - <br />
150   -
151   - <!--Password-->
152   - <label class="external_input"for="password">Password</label>
153   - <input id="password" name="password" type="password" value="" size="31" maxlength="255" tabindex="6" style="margin-left:6px;"/>
154   - <div class="password-meter">
155   - <div class="password-meter-message"></div>
156   - <div class="password-meter-bg">
157   - <div class="password-meter-bar"></div>
158   - </div>
159   - </div>
160   - <br />
161   -
162   - <!--Verify Password-->
163   - <label class="external_input"for="password_verify">Verify Password</label>
164   - <input id="password_verify" name="password" type="password" value="" size="31" maxlength="255" tabindex="7" style="margin-left:-39px;"/>
165   - <br />
166   -
167   - <!--Submit-->
168   - <input id="submit" name="submit" type="submit" value="Submit" size="31" maxlength="255" tabindex="8" />
169   ->>>>>>> e2c39a4bcc47c99c3639b3d55c1b303c21b37806
170 123
171 124 </form>
172   -
173 125 </div>
174 126 </div>
175 127 </div>

0 comments on commit 4d0a6d0

Please sign in to comment.
Something went wrong with that request. Please try again.