Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added redirect page; removed eula; other minor text changes

  • Loading branch information...
commit 63e7fb2b9637a0257e8c9a3d2b18f29cdf2b16e3 1 parent 6025074
Travis Treseder authored
7 app/models/job.rb
View
@@ -74,9 +74,10 @@ def start
end
poy_script="#{read_poy_script_segment}
set(log: \"poy.log\")
-#{poy_search}
-transform (static_approx)
-report (\"report.nexus\", nexus, trees:(nexus))
+#{poy_search}"
+
+ poy_script << "\ntransform (static_approx)\n" unless Sfile.subset_file_types?(file_types, "pre")
+ poy_script << "report (\"report.nexus\", nexus, trees:(nexus))
report(\"#{name}_results.kml\", kml:(supramap, \"#{sfiles.select { |file| file.filetype == "geo" }[0].name}\"))
report(asciitrees)
report(\"#{name}_results.tre\",trees)
9 app/models/user.rb
View
@@ -9,7 +9,7 @@ class User < ActiveRecord::Base
# since the password isn't permanently stored, this validation
# is not applicable for anything beyond user creation
- validates_format_of:password,
+ validates_format_of :password,
# modified from http://regexlib.com/REDetails.aspx?regexp_id=2204
:with => /(?-i)(?=^.{6,}$)((?!.*\s)(?=.*[a-zA-Z]))((?=(.*\d){1,})|(?=(.*\W){1,}))^.*$/,
:message => "(please enter a valid password with 6-20 characters and at least one non-letter)",
@@ -18,19 +18,16 @@ class User < ActiveRecord::Base
# logins are used in the file path, so they must be valid Unix file names
# alphanumeric to keep it simple, adding periods would complicate things since
# hidden files have periods at the beginning
- validates_format_of:login,
+ validates_format_of :login,
# taken from http://regexlib.com/REDetails.aspx?regexp_id=145
:with => /^[a-zA-Z0-9]+$/,
:message => "(alphanumeric only)"
- validates_format_of:email,
+ validates_format_of :email,
# taken from http://www.devx.com/enterprise/Article/31197/0/page/3
:with => /\A[\w\._%-]+@[\w\.-]+\.[a-zA-Z]{2,4}\z/,
:message => "(please enter a valid address)"
- # user must accept eula
- validates_acceptance_of :eula
-
attr_accessor :password_confirmation
attr_reader :password
210 app/views/login/register.html.erb
View
@@ -9,149 +9,75 @@
<title></title>
</head>
<body>
- <fieldset>
- <legend>Register New User</legend>
- <%= form_for :user do |form| %> <input type="hidden" id=
- "user_id" name="user[admin]" value="0" /><input type="hidden"
- id="user_id" name="user[auth]" value="0" />
- <table>
- <tr>
- <td>
- First Name:
- </td>
- <td>
- <%= form.text_field :firstname, :size => 20 %>
- </td>
- </tr>
- <tr>
- <td>
- Last Name:
- </td>
- <td>
- <%= form.text_field :lastname, :size => 20 %>
- </td>
- </tr>
- <tr>
- <td>
- Username:
- </td>
- <td>
- <%= form.text_field :login, :size => 20 %>
- </td>
- </tr>
- <tr>
- <td>
- <font size="1">alphanumeric only</font>
- </td>
- </tr>
- <tr>
- <td>
- E-Mail:
- </td>
- <td>
- <%= form.text_field :email, :size => 20 %>
- </td>
- </tr>
- <tr>
- <td>
- Password:
- </td>
- <td>
- <%= form.password_field :password, :size => 20 %>
- </td>
- </tr>
- <tr>
- <td>
- <font size="1">6-20 characters, at least one
- nonletter</font>
- </td>
- </tr>
- <tr>
- <td>
- Confirm:
- </td>
- <td>
- <%= form.password_field :password_confirmation, :size => 20 %>
- </td>
- </tr>
- </table>
- </fieldset>
- <fieldset>
- <legend>end user license agreement</legend>
- <fieldset>
- <div style="height:250px;overflow:auto;">
- <p align="left">
- <font size="1">COPYRIGHT © 2008 THE OHIO STATE
- UNIVERSITY</font>
- </p>
- <p align="left">
- <font size="1">ALL RIGHTS RESERVED</font>
- </p>
- <p align="left">
- <font size="1">Dr. Daniel Janies, Ph.D,
- Daniel.Janies@osumc.edu, 614-292-1202,</font>
- </p>
- <p align="left">
- <font size="1">The Ohio State University College of
- Medicine provides this Web-Based Genotypic and
- Phenotypic Geospatial Generator Service (collectively
- the “Service”) as an informational service. Use of the
- Service is governed by the terms and conditions
- provided below. Please read the statements below
- carefully before accessing or using the Service. By
- accessing or using the Service, you agree to be bound
- by all the terms and conditions herein.</font>
- </p>
- <p align="left">
- <font size="1">Permission is granted to use this
- Service for individual, clinical, research, or
- noncommercial educational use only, provided that The
- Ohio State University and authors of the Service are
- acknowledged in any publications reporting its use, and
- the name of The Ohio State University or any of its
- officers, employees, students or board members is not
- used in any advertising or publicity pertaining to the
- use of the Service without specific, written prior
- authorization. Those desiring to incorporate the
- Service into commercial products or use the Service for
- promotional purposes should contact, Technology
- Licensing and Commercialization, The Ohio State
- University, 1960 Kenny Road, Columbus, Ohio,
- 43210-1063, (614) 292-1315, http://tlc.osu.edu/.</font>
- </p>
- <p align="left">
- <font size="1">The Service is provided AS IS, WITHOUT
- REPRESENTATION AS TO ITS FITNESS FOR ANY PURPOSE, AND
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR
- IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
- WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- PURPOSE, AND NONINFRINGEMENT. No guarantees are made
- with respect to accuracy, completeness, errors, or
- omissions of content. The Ohio State University has no
- obligation to provide support, updates, enhancements,
- or other modifications. In no event will the Ohio State
- University be liable for any decision made or action
- taken in reliance upon the information provided through
- the Service. THE OHIO STATE UNIVERSITY SHALL NOT BE
- LIABLE FOR ANY COMPENSATORY OR NON-COMPENSATORY
- DAMAGES, INCLUDING BUT NOT LIMITED TO SPECIAL,
- INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WITH
- RESPECT TO ANY CLAIM ARISING OUT OF OR IN CONNECTION
- WITH THE USE OF THE SERVICE, EVEN IF IT HAS BEEN OR IS
- HEREAFTER ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGES.</font>
- </p>
- <p align="left">
- <font size="1">By clicking “I Agree”, you agree to the
- terms and conditions stated above.</font>
- </p>
- </div>
- </fieldset>I Agree:
+
+ <fieldset>
+ <legend>Register New User</legend>
+ <%= form_for :user do |form| %> <input type="hidden" id="user_id" name="user[admin]" value="0"/>
+ <input type="hidden" id="user_id" name="user[auth]" value="0"/>
<table>
<tr>
- <%= check_box :user, :eula %>
+ <td>
+ First Name:
+ </td>
+ <td>
+ <%= form.text_field :firstname, :size => 20 %>
+ </td>
</tr>
- </table><%= submit_tag "Register", :class => "submit" %><% end%>
- </fieldset>
- </body>
+ <tr>
+ <td>
+ Last Name:
+ </td>
+ <td>
+ <%= form.text_field :lastname, :size => 20 %>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Username:
+ </td>
+ <td>
+ <%= form.text_field :login, :size => 20 %>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <font size="1">alphanumeric only</font>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ E-Mail:
+ </td>
+ <td>
+ <%= form.text_field :email, :size => 20 %>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Password:
+ </td>
+ <td>
+ <%= form.password_field :password, :size => 20 %>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <font size="1">6-20 characters, at least one
+ nonletter</font>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Confirm:
+ </td>
+ <td>
+ <%= form.password_field :password_confirmation, :size => 20 %>
+ </td>
+ </tr>
+ </table>
+ <%= submit_tag "Register", :class => "submit" %>
+ </fieldset>
+ <% end %>
+
+ </body>
</html>
2  app/views/supramap/home.html.erb
View
@@ -2,7 +2,7 @@
<p>Welcome to Supramap, a web application for integrating genetic, evolutionary, geospatial, and temporal data.
<ul>
<li>The paper announcing this web application:
- <a href="http://www3.interscience.wiley.com/cgi-bin/fulltext/123345005/PDFSTART">
+ <a href="http://onlinelibrary.wiley.com/doi/10.1111/j.1096-0031.2010.00314.x/pdf">
The Supramap project: Linking pathogen genomes with geography to fight emergent infections diseases</a> Is now
open access.
</li>
8 public/index.html
View
@@ -0,0 +1,8 @@
+<html>
+<head>
+ <meta http-equiv="REFRESH" content="0;url=supramap/home"/>
+ <title></title>
+</head>
+<body>
+</body>
+</html>
Please sign in to comment.
Something went wrong with that request. Please try again.