Permalink
Browse files

Merge commit 'ea3821a80d859c3c57268cfdcd5f978be71edcb7' into HEAD

  • Loading branch information...
2 parents d207689 + ea3821a commit 2cb3a9e8d4714978b9f8db741c1acc191f231d9d Jenkins committed Sep 27, 2012
@@ -176,10 +176,13 @@ input[type="text"], input[type="email"], input[type="tel"] {
}
div.upload {
+ padding-top: 0.3em;
padding-bottom: 0.3em;
- border-bottom: 1px solid #BBB;
}
+div.line {
+ border-bottom: 1px solid #BBB;
+}
select {
line-height: 1.5em;
View
@@ -1,12 +1,14 @@
<fieldset>
+ <fieldset>
+ <label style="height:20px;">Alternatively</label>
+ </fieldset>
+
+ <div class="line"></div>
+
<div class="upload">
- <label for="<%= id %>">Do you want to upload a file? (20MB limit)</label>
+ <label for="<%= id %>"><%= uploadmessage %> (20MB limit) </label>
<br/>
<input id="<%= id %>" name="<%= name %>" type="file" accept="text/*, application/pdf, .xls, .xlsx"/>
<%= erb :errors, :locals => {"key" => name} %>
</div>
</fieldset>
-
-<fieldset>
- <label style="height:50px;">Alternatively</label>
-</fieldset>
@@ -1,9 +1,6 @@
<section id="user">
<header class="section-header">User details</header>
- <%= erb :upload, :locals => {"id" => "file-input", "name" => "uploaded_data"}%>
-
-
<label for="user_name">Name</label>
<input id="user_name" name="user_name" type="text" <%= erb :assignvalue, :locals => {:param => @formdata[:user_name]} %>>
<%= erb :errors, :locals => {"key" => "User name"} %>
@@ -19,4 +16,7 @@
<textarea id="comments" rows="10" cols="50" name="additional"><%= @formdata[:additional] %></textarea>
</div>
</fieldset>
+
+ <%= erb :upload, :locals => {"id" => "file-input", "name" => "uploaded_data", "uploadmessage" => "If you have multiple users to be added, you can upload a file here"}%>
+
</section>
@@ -1,8 +1,6 @@
<section id="user">
<header class="section-header">User details</header>
- <%= erb :upload, :locals => {"id" => "file-input", "name" => "uploaded_data"}%>
-
<label for="user_name">Username</label>
<input id="user_name" name="user_name" type="text" <%= erb :assignvalue, :locals => {:param => @formdata[:user_name]} %>>
<%= erb :errors, :locals => {"key" => "User name"} %>
@@ -21,4 +19,7 @@
<textarea id="comments" rows="10" cols="50" name="additional"><%= @formdata[:additional] %></textarea>
</div>
</fieldset>
+
+ <%= erb :upload, :locals => {"id" => "file-input", "name" => "uploaded_data", "uploadmessage" => "If you have multiple users to be removed, you can upload a file here"}%>
+
</section>

0 comments on commit 2cb3a9e

Please sign in to comment.