Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '4b288f97d1134a50847b621830bcf7f2b0f56854' into HEAD
- Loading branch information
Showing
11 changed files
with
149 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,35 @@ | ||
| <section id="author"> | ||
| <header class="section-header">Your details</header> | ||
| <label for="name">Name</label> | ||
| <input id="name" name="name" type="text" required <%= erb :assignvalue, :locals => {:param => @formdata[:name]} %> > | ||
| <fieldset> | ||
| <div> | ||
| <label for="name">Name</label> | ||
| <input id="name" name="name" type="text" required <%= erb :assignvalue, :locals => {:param => @formdata[:name]} %> > | ||
| </div> | ||
| <div> | ||
| <label for="email">Email</label> | ||
| <input id="email" name="email" type="email" required <%= erb :assignvalue, :locals => {:param => @formdata[:email]} %> > | ||
| </div> | ||
| <div> | ||
| <label for="job">Job title</label> | ||
| <input id="job" name="job" type="text" required <%= erb :assignvalue, :locals => {:param => @formdata[:job]} %> > | ||
| </div> | ||
| <div> | ||
| <label for="phone">Phone number</label> | ||
| <input id="phone" name="phone" pattern="([\d\s]*)" type="tel" | ||
| <%= erb :assignvalue, :locals => {:param => @formdata[:phone]} %>> | ||
| </div> | ||
| <div> | ||
| <label for="department_list">Department</label> | ||
| <select id="department_list" name="department" required> | ||
| <% @departments.each do |key, value| %> | ||
| <% if value == @formdata["department"] %> | ||
| <option selected="selected" value="<%= value %>"><%= key %> </option> | ||
| <% else %> | ||
| <option value="<%= value %>"><%= key %> </option> | ||
| <% end %> | ||
| <% end %> | ||
| </select> | ||
| </div> | ||
| </fieldset> | ||
|
|
||
| <label for="email">Email</label> | ||
| <input id="email" name="email" type="email" required <%= erb :assignvalue, :locals => {:param => @formdata[:email]} %> > | ||
|
|
||
| <label for="job">Job title</label> | ||
| <input id="job" name="job" type="text" required <%= erb :assignvalue, :locals => {:param => @formdata[:job]} %> > | ||
|
|
||
| <label for="phone">Phone number</label> | ||
| <input id="phone" name="phone" pattern="([\d\s]*)" type="tel" | ||
| <%= erb :assignvalue, :locals => {:param => @formdata[:phone]} %>> | ||
|
|
||
| <label for="department_list">Department</label> | ||
| <select id="department_list" name="department" required> | ||
| <% @departments.each do |key, value| %> | ||
| <% if value == @formdata["department"] %> | ||
| <option selected="selected" value="<%= value %>"><%= key %> </option> | ||
| <% else %> | ||
| <option value="<%= value %>"><%= key %> </option> | ||
| <% end %> | ||
| <% end %> | ||
| </select> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <section id="content"> | ||
| <header class="section-header">New need details</header> | ||
|
|
||
| <label for="comments">Additional comments</label> | ||
| <label for="comments">Comments</label> | ||
| <textarea id="comments" rows="10" cols="50" name="additional"><%=@formdata[:additional]%></textarea> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,28 @@ | ||
| <section id="user"> | ||
| <header class="section-header">User details</header> | ||
|
|
||
| <fieldset> | ||
| <div class="upload"> | ||
| <label for="file-input">Do you want to upload a file? (20MB limit)</label> | ||
| <input id="file-input" name="uploaded_data" type="file"/> | ||
| </div> | ||
| </fieldset> | ||
|
|
||
| <fieldset> | ||
| <label style="height:50px;">Alternatively</label> | ||
| </fieldset> | ||
|
|
||
| <label for="user_name">Name</label> | ||
| <input id="user_name" name="user_name" type="text" <%= erb :assignvalue, :locals => {:param => @formdata[:user_name]} %>> | ||
|
|
||
| <label for="email">Email</label> | ||
| <input id="email" name="user_email" type="email" <%= erb :assignvalue, :locals => {:param => @formdata[:user_email]} %>> | ||
|
|
||
| <label for="file-input">Attach a file to grant access for multiple users (20MB limit)</label> | ||
| <!-- Attach Form --> | ||
| <input id="file-input" name="uploaded_data" type="file"/> | ||
|
|
||
|
|
||
| <label for="comments">Additional comments</label> | ||
| <textarea id="comments" rows="10" cols="50" name="additional"><%= @formdata[:additional] %></textarea> | ||
| <fieldset> | ||
| <div class="comments"> | ||
| <label for="comments">Additional comments</label> | ||
| <textarea id="comments" rows="10" cols="50" name="additional"><%= @formdata[:additional] %></textarea> | ||
| </div> | ||
| </fieldset> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,30 @@ | ||
| <section id="user"> | ||
| <header class="section-header">User details</header> | ||
|
|
||
| <fieldset> | ||
| <div class="upload"> | ||
| <label for="file-input">Do you want to upload a file? (20MB limit)</label> | ||
| <input id="file-input" name="uploaded_data" type="file"/> | ||
| </div> | ||
| </fieldset> | ||
|
|
||
| <fieldset> | ||
| <label style="height:50px;">Alternatively</label> | ||
| </fieldset> | ||
|
|
||
| <label for="user_name">Username</label> | ||
| <input id="user_name" name="user_name" type="text" <%= erb :assignvalue, :locals => {:param => @formdata[:user_name]} %>> | ||
|
|
||
| <label for="email">Email</label> | ||
| <input id="email" name="user_email" type="email" <%= erb :assignvalue, :locals => {:param => @formdata[:user_email]} %>> | ||
|
|
||
| <label for="file-input">Attach a file to remove access for multiple users (20MB limit)</label> | ||
| <!-- Attach Form --> | ||
| <input id="file-input" name="uploaded_data" type="file"/> | ||
|
|
||
| <%= erb :date, :locals => {:title => "Not before", :label => 'not_before', :day => @formdata[:not_before_day], :month => @formdata[:not_before_month], :year => @formdata[:not_before_year]}%> | ||
| <div style="clear:both;"></div> | ||
| <label for="comments">Additional comments</label> | ||
| <textarea id="comments" rows="10" cols="50" name="additional"><%=@formdata[:additional]%></textarea> | ||
|
|
||
| <fieldset> | ||
| <div class="comments"> | ||
| <label for="comments">Additional comments</label> | ||
| <textarea id="comments" rows="10" cols="50" name="additional"><%= @formdata[:additional] %></textarea> | ||
| </div> | ||
| </fieldset> | ||
| </section> |