spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Migrating to HAML

pull/37/head
rick carlino 2014-05-01 06:58:42 -07:00
parent 6c5ac4290f
commit 535424ee0c
4 changed files with 59 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -34,6 +34,8 @@ group :development, :test do
gem 'simplecov'
end
gem 'haml'
gem 'capybara', group: :test
gem 'devise', github: 'plataformatec/devise'

3
Gemfile.lock
View File

@ -77,6 +77,8 @@ GEM
foundation-rails (5.2.2.0)
railties (>= 3.1.0)
sass (>= 3.2.0)
haml (4.0.5)
tilt
high_voltage (2.1.0)
hike (1.2.3)
i18n (0.6.9)
@ -205,6 +207,7 @@ DEPENDENCIES
devise!
foundation-icons-sass-rails
foundation-rails
haml
high_voltage
jbuilder (~> 1.2)
jquery-rails

49
app/views/pages/welcome.html.erb
View File

@ -1,49 +0,0 @@
<div class="row">
<div class="large-12 columns">
<h1>Create your Farmbot Account</h1>
</div>
</div>
<div class="row">
<div class="large-6 columns">
<ul>
<li>Graphically Design your farm or garden with drag and drop plants and operations.</li>
<li>Adjust grow settings for maximum efficiency.</li>
<li>Analyze data maps for data-driven design.</li>
<li>View and edit scheduled operations.</li>
<li>Communicate with your FarmBot.</li>
</ul>
</div>
<div class="large-6 columns">
<div class="signup-panel">
<p class="welcome"> Create your Account</p>
<form>
<div class="row collapse">
<div class="small-2 columns">
<span class="prefix"><i class="fi-torso-female"></i></span>
</div>
<div class="small-10 columns">
<input type="text" placeholder="username">
</div>
</div>
<div class="row collapse">
<div class="small-2 columns">
<span class="prefix"><i class="fi-mail"></i></span>
</div>
<div class="small-10 columns">
<input type="text" placeholder="email">
</div>
</div>
<div class="row collapse">
<div class="small-2 columns ">
<span class="prefix"><i class="fi-lock"></i></span>
</div>
<div class="small-10 columns ">
<input type="text" placeholder="password">
</div>
</div>
</form>
<a href="#" class="button ">Next Step</a>
<p>Already have an account? <a href="#">Login here »</a></p>
</div><!--end signup form-->
</div>
</div>

54
app/views/pages/welcome.html.haml 100644
View File

@ -0,0 +1,54 @@
.row
.large-12.columns
%h1 Create your Farmbot Account
.row
.large-6.columns
%ul
%li Graphically Design your farm or garden with drag and drop plants and operations.
%li Adjust grow settings for maximum efficiency.
%li Analyze data maps for data-driven design.
%li View and edit scheduled operations.
%li Communicate with your FarmBot.
.large-6.columns
.signup-panel
%p.welcome Create your Account
%form{action: "/users", method: "post"}
.row.collapse
.small-2.columns
%span.prefix
%i.fi-torso-female
.small-10.columns
%input{placeholder: "username", type: "text"}/
.row.collapse
.small-2.columns
%span.prefix
%i.fi-mail
.small-10.columns
%input{placeholder: "email", type: "text"}/
.row.collapse
.small-2.columns
%span.prefix
%i.fi-lock
.small-10.columns
%input{placeholder: "password", type: "password"}/
.row.collapse
.small-2.columns
%span.prefix
%i.fi-lock
.small-10.columns
%input{placeholder: "Confirm Password", type: "password"}/
%a.button
Next Step
%p
Already have an account?
%a{href: "#"} Login here »
/ = form_for :person do |f|
/ First name: #{f.text_field :first_name}
/ %br/
/ Last name : #{f.text_field :last_name}
/ %br/
/ Biography : #{f.text_area :biography}
/ %br/
/ Admin? : #{f.check_box :admin}
/ %br/
/ = f.submit