diff --git a/Gemfile b/Gemfile
index b59b6e2e2fb..2a167f1a303 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ gem 'devise_invitable', '~> 1.0.0'
gem 'pg'
gem 'capistrano'
gem 'jquery-rails'
+gem "jquery-scrollto-rails"
gem 'inherited_resources'
gem 'formtastic' # Deprecated - use simple_form instead.
gem 'simple_form', '~> 2.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3da3c371b3e..4692527a3d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -118,7 +118,7 @@ GEM
client_side_validations-simple_form (2.0.1)
client_side_validations (~> 3.2.0)
simple_form (~> 2.0.3)
- cocaine (0.2.1)
+ cocaine (0.4.2)
coffee-filter (0.1.1)
coffee-script (>= 2.2.0)
haml (>= 3.0.18)
@@ -245,6 +245,8 @@ GEM
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
+ jquery-scrollto-rails (1.4.2)
+ railties (~> 3.1)
json (1.7.6)
kaminari (0.13.0)
actionpack (>= 3.0.0)
@@ -297,11 +299,11 @@ GEM
paper_trail (2.6.3)
activerecord (~> 3.0)
railties (~> 3.0)
- paperclip (3.1.2)
+ paperclip (3.4.0)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
- cocaine (>= 0.0.2)
+ cocaine (~> 0.4.0)
mime-types
pg (0.11.0)
polyamorous (0.5.0)
@@ -485,6 +487,7 @@ DEPENDENCIES
jqplot-rails
jquery-atwho-rails
jquery-rails
+ jquery-scrollto-rails
kaminari
launchy
letter_opener
diff --git a/app/assets/images/adaptive.png b/app/assets/images/adaptive.png
new file mode 100644
index 00000000000..12d7f153a0e
Binary files /dev/null and b/app/assets/images/adaptive.png differ
diff --git a/app/assets/images/circlelogo.png b/app/assets/images/circlelogo.png
new file mode 100644
index 00000000000..f895db78055
Binary files /dev/null and b/app/assets/images/circlelogo.png differ
diff --git a/app/assets/images/coop.png b/app/assets/images/coop.png
new file mode 100644
index 00000000000..267391ac54e
Binary files /dev/null and b/app/assets/images/coop.png differ
diff --git a/app/assets/images/coop75.png b/app/assets/images/coop75.png
new file mode 100644
index 00000000000..ed3e068f31f
Binary files /dev/null and b/app/assets/images/coop75.png differ
diff --git a/app/assets/images/free.png b/app/assets/images/free.png
new file mode 100644
index 00000000000..4d90034181c
Binary files /dev/null and b/app/assets/images/free.png differ
diff --git a/app/assets/images/free75.png b/app/assets/images/free75.png
new file mode 100644
index 00000000000..e310fb4978f
Binary files /dev/null and b/app/assets/images/free75.png differ
diff --git a/app/assets/images/how-it-works-decision-big.jpg b/app/assets/images/how-it-works-decision-big.jpg
new file mode 100644
index 00000000000..f0e956e0aa2
Binary files /dev/null and b/app/assets/images/how-it-works-decision-big.jpg differ
diff --git a/app/assets/images/how-it-works-discussion-big.jpg b/app/assets/images/how-it-works-discussion-big.jpg
new file mode 100644
index 00000000000..2e9a12f1fea
Binary files /dev/null and b/app/assets/images/how-it-works-discussion-big.jpg differ
diff --git a/app/assets/images/how-it-works-overview-big.jpg b/app/assets/images/how-it-works-overview-big.jpg
new file mode 100644
index 00000000000..b7e88e9c00e
Binary files /dev/null and b/app/assets/images/how-it-works-overview-big.jpg differ
diff --git a/app/assets/images/how-it-works-position-big.jpg b/app/assets/images/how-it-works-position-big.jpg
new file mode 100644
index 00000000000..e2fa01b46d3
Binary files /dev/null and b/app/assets/images/how-it-works-position-big.jpg differ
diff --git a/app/assets/images/how-it-works-position-ss.jpg b/app/assets/images/how-it-works-position-ss.jpg
index 6732a1d23be..a8c4ccc44cd 100644
Binary files a/app/assets/images/how-it-works-position-ss.jpg and b/app/assets/images/how-it-works-position-ss.jpg differ
diff --git a/app/assets/images/how-it-works-position-ss.png b/app/assets/images/how-it-works-position-ss.png
new file mode 100644
index 00000000000..dc2fd22ef10
Binary files /dev/null and b/app/assets/images/how-it-works-position-ss.png differ
diff --git a/app/assets/images/independent.png b/app/assets/images/independent.png
new file mode 100644
index 00000000000..767bcf8d8b4
Binary files /dev/null and b/app/assets/images/independent.png differ
diff --git a/app/assets/images/link-icon.png b/app/assets/images/link-icon.png
new file mode 100644
index 00000000000..af965acc40e
Binary files /dev/null and b/app/assets/images/link-icon.png differ
diff --git a/app/assets/images/logo-426px-mauve-matte.png b/app/assets/images/logo-426px-mauve-matte.png
new file mode 100644
index 00000000000..ad71958660e
Binary files /dev/null and b/app/assets/images/logo-426px-mauve-matte.png differ
diff --git a/app/assets/images/logo-872px-mauve-matte.png b/app/assets/images/logo-872px-mauve-matte.png
new file mode 100644
index 00000000000..18dcaa643f3
Binary files /dev/null and b/app/assets/images/logo-872px-mauve-matte.png differ
diff --git a/app/assets/images/process-flow.png b/app/assets/images/process-flow.png
deleted file mode 100644
index 9e0d2ef02ea..00000000000
Binary files a/app/assets/images/process-flow.png and /dev/null differ
diff --git a/app/assets/images/transparency.png b/app/assets/images/transparency.png
new file mode 100644
index 00000000000..1bd87b6404a
Binary files /dev/null and b/app/assets/images/transparency.png differ
diff --git a/app/assets/images/transparency75.png b/app/assets/images/transparency75.png
new file mode 100644
index 00000000000..e24bfc790c4
Binary files /dev/null and b/app/assets/images/transparency75.png differ
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 518f7532847..4c8b4cbfb43 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,6 +12,7 @@
//= require lib/jquery.tokeninput
//= require lib/jquery.mousewheel
//= require lib/jquery.placeholder
+//= require scrollTo
//= require rails.validations
//= require rails.validations.simple_form
//= require underscore
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index 9c3cbfd4713..b5eb9a679c9 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -322,3 +322,19 @@ $ ->
)
e.preventDefault()
)
+
+# homepage accordion
+$ ->
+ $(".collapse").collapse()
+
+# homepage scroll effect
+$ ->
+ $(".scroll-nav").click((event)->
+ target = this.hash
+ offsetIE7 = 0;
+ if ($.browser.msie && parseInt($.browser.version, 10) == 7)
+ offsetIE7 = -34;
+ event.preventDefault()
+ $.scrollTo(target, 1000, {offset: offsetIE7})
+ location.hash = target
+ )
diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
index 234345b9a28..f4fa3fe2a34 100644
--- a/app/assets/stylesheets/main.css.scss
+++ b/app/assets/stylesheets/main.css.scss
@@ -496,3 +496,18 @@ a.btn-icon:hover { color: $dark-grey; }
background-image: url("pie-light-24.png");
}
+// Temporary overrides for the new homepage (Jan 2013)
+.sessions.new {
+ form {
+ #user_email, #user_password, textarea {
+ width: 100%;
+ }
+ input[type="checkbox"] {
+ margin: 3px 0px;
+ display: inline-block;
+ }
+ input[type="submit"] {
+ margin: 14px 0 9px 0;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/pages.css.scss b/app/assets/stylesheets/pages.css.scss
index f30989f58dc..73527f52a4f 100644
--- a/app/assets/stylesheets/pages.css.scss
+++ b/app/assets/stylesheets/pages.css.scss
@@ -1,133 +1,187 @@
-@import "settings";
-@import "bootstrap/mixins";
+body.sessions.new, body.pages.show{
+ color: black;
-body.pages, body.sessions.new {
- background-color: #F7F7ED;
-
- h1 { display: block; }
- h2 {
- color: $dark-grey;
- font-size: 28px;
- margin: 0 0 10px;
- }
- h3 {
- color: $mid-grey;
- font-size: 21px;
- font-weight: normal;
- margin-bottom: 15px;
- }
- p {
- margin-bottom: 15px;
+ p, label{
+ font-size: 18px;
line-height: 24px;
+ margin-bottom: 18px;
+ font-weight: 300;
}
- ul.about {
- list-style: circle;
- padding-left: 20px;
+ label{
+ margin-bottom: 0;
}
- ul.about li { margin-bottom: 10px; }
-
- .main-container.container { padding-top: 0px; }
- .inner-container { padding: 0 10px; }
-
- .how-it-works-panel{
- p{
- font-size: 16px;
+ .home-flash{
+ margin-top: 50px;
+ margin-bottom: -50px;
+ }
+ .navbar{
+ .navbar-inner .container{
+ margin-top: 0;
}
- img, iframe{
- border: 1px solid #eee;
+ a.brand{
+ padding-bottom: 0;
+ margin-top: -6px;
+ margin-left: 20px;
}
- .position-icons img{
- float: left;
- border: 0;
- width: 30px;
- height: 30px;
- padding-right: 7px;
+ .pull-right{
+ padding-right: 34px;
}
- .position-icons p{
- font-size: 14px;
+ }
+ .container{
+ .subhead{
+ padding-bottom: 24px;
+ }
+ h1{
+ margin-bottom: 5px;
+ }
+ h2{
+ letter-spacing: -1px;
+ font-size: 30px;
+ line-height: 36px;
+ margin-bottom: 5px;
+ }
+ h2.squish{
+ font-size:28px;
+ }
+ h3{
+ font-size: 20px;
+ line-height: 24px;
+ margin-bottom: 18px;
+ }
+ .buffer{
+ margin-bottom: 18px;
+ }
+ .no-bottom-margin{
+ margin-bottom: 0px;
}
- p.special-last{ margin-bottom: 0;}
}
-
- hr {
- margin: 2.5em 0;
+ .subhead h1, .head h1{
+ font-size: 50px;
+ margin-bottom: 9px;
+ letter-spacing: -1px;
}
-
- #github-link {
- position: absolute;
- right: 0px;
+ .head h1{
+ margin: 72px 0 9px 0;
+ }
+ .inner-container{
+ padding: 34px;
+ }
+ .section{
+ margin-top: 34px;
+ background: white;
+ box-shadow: 3px 3px 5px #eee;
+ border: 1px solid #eee;
+ }
+ .section#first{
+ background: transparent;
+ margin-top: 0px;
+ box-shadow: none;
+ border: none;
+ margin-top: 66px;
+ }
+ #first .inner-container{
+ padding: 0 34px;
+ }
+ #principles img, #purpose img{
float: right;
+ margin: 10px 10px 0 0 ;
}
- .main-navigation{
- .navbar .nav li a { text-shadow: none;}
- .navbar .nav li a:hover { color: $dark-grey; }
- .navbar .nav .active a{ background-color: $loomio-orange; }
- .navbar-inner {
- min-height: 39px;
- background-color: #FAFAFA;
- background-image: -moz-linear-gradient(top, white, #F2F2F2);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(white), to(#F2F2F2));
- background-image: -webkit-linear-gradient(top, white, #F2F2F2);
- background-image: linear-gradient(to bottom, white, #F2F2F2);
- background-repeat: repeat-x;
- border: 1px solid #DDD;
- box-shadow: none;
+ #coop img{ margin-top: 0;}
+ #adaptive img {margin-top: -10px;}
+ #free img{ margin-top: 5px;}
+ #how-it-works {
+ img, iframe{
+ border: 1px solid #eee;
+ margin-bottom: 18px;
}
- }
-
- .header {
- margin-bottom: 20px;
- height: 150px;
- background-image: url(loomio-orange.png);
- background-position: 5px top;
- background-repeat: no-repeat;
- text-indent: -999em;
- span {
- display: none;
- }
- }
- #loomio-project-iframe { margin-left: -10px; }
-
- // *** browser not supported ***
- .notice { padding-bottom: 25px; }
-
- ul#browser-icons{
- li {
- float: left;
- height: 120px;
- margin: 5px;
- padding: 5px;
- width: 160px;
+ .no-bottom-margin{
+ margin-bottom: 0px;
+ }
+ .positions img{
+ width: 30px;
+ margin-right: 4px;
+ border: none;
}
- li:hover{
- background-color: #F7F7ED;
- @include border-radius(4px);
+ .modal{
+ width: 902px;
+ margin-left: -450px;
+ margin-top: -340px;
+ -webkit-border-radius: 0px;
+ -moz-border-radius: 0px;
+ border: none;
}
- li:hover{
- p.browser-title, p.visit-site{
- background-color: $light-grey;
- color: white;
+ .modal-body{
+ width: 900px;
+ max-height: 675px;
+ padding: 0px;
+ margin: 1px;
+ overflow-y: hidden;
+ overflow-x: hidden;
+ a{
+ cursor: pointer;
}
}
+ .close{
+ position: absolute;
+ top: 10px;
+ right: 10px;
+ font-size: 30px;
+ opacity: 1;
+ }
+ }
+ .divider{
+ border-top: 1px solid #eee;
+ margin: 14px 223px 34px 223px;
+ }
+ .more-link{
+ .toggle{
+ background: url("link-icon.png") 4px 4px no-repeat #f8f8f8;
+ font-size: 15px;
+ padding: 4px 4px 4px 24px;
+ a{
+ display: block;
+ width: 100%;
+ height: 100%;
+ font-size: 15px;
+ }
+ a:hover{
+ text-decoration: none;
+ color: black;
+ cursor: pointer;
+ }
+ }
+ i{
+ margin: 2px;
+ }
+ li{
+ padding: 4px;
+ }
a{
- color: $mid-grey;
+ font-size: 14px;
}
- img {
- display: block;
- height: 80px;
- margin: 0 auto 10px;
+ .collapse{
+ border: 1px solid #f8f8f8;
+ border-top: 0px;
}
- p{
- font-size:$font-tiny;
+ }
+ input.pull-left{
+ margin-right: 5px;
+ }
+ form a{
+ font-size: 18px;
+ }
+ ul#browser-icons{
+ a{
+ font-size: 16px;
+ line-height: 18px;
}
- p.browser-title, p.visit-site{
+ li {
+ float: left;
+ height: 120px;
+ margin: 5px;
+ padding: 5px;
+ width: 150px;
text-align: center;
- color: $dark-grey;
- background-color: $lighter-grey;
- @include border-radius(4px);
- }
- p.browser-description{
- height: 100px;
}
}
}
\ No newline at end of file
diff --git a/app/views/application/_header_logged_out.html.haml b/app/views/application/_header_logged_out.html.haml
index 643d8ec35c3..9d67aecaa26 100644
--- a/app/views/application/_header_logged_out.html.haml
+++ b/app/views/application/_header_logged_out.html.haml
@@ -1,23 +1,28 @@
-%h1.header Loomio
-.main-navigation
- .navbar
- .navbar-inner
- %a.btn.btn-navbar{ 'data-toggle' => "collapse", 'data-target' => ".nav-collapse" }
- - page_id = params[:id]
+- if params[:id] == 'home'
+ - scroll_trigger = "scroll-nav"
- %ul.nav
- %li{ class: css_class_active(page_id, 'home') }
- %a{:href => "/"} Home
- %li{ class: css_class_active(page_id, 'how_it_works') }
- %a{:href => page_path('how_it_works')} How it works
- %li{ class: css_class_active(page_id, 'get_involved') }
- %a{:href => page_path('get_involved')} Get involved
- %li{ class: css_class_active(page_id, 'about') }
- %a{:href => page_path('about')} About
- %li{ class: css_class_active(page_id, 'blog') }
- %a{:href => "http://loomio.org/blog"} Blog
- %li{ class: css_class_active(page_id, 'contact') }
- %a{:href => page_path('contact')} Contact
- %ul.nav.pull-right
- %li{ class: css_class_active(params[:controller], 'devise/sessions') }
- %a{ :href => user_session_path } Sign in
+.navbar.navbar-fixed-top
+ .navbar-inner
+ .container
+ %a.brand{href: "/#top", class: "#{scroll_trigger}"}
+ =image_tag("top-bar-loomio.png")
+ .nav-collapse
+ %ul.nav
+ %li
+ %a{href: "/#why", class: "#{scroll_trigger}"} Why
+ %li
+ %a{href: "/#how", class: "#{scroll_trigger}"} How
+ %li
+ %a{href: "/#who", class: "#{scroll_trigger}"} Who
+ %ul.nav.pull-right
+ %li
+ %a{href: user_session_path} Sign In
+
+.container#top
+ .section#first
+ .inner-container
+ .row-fluid
+ .span3
+ .span6
+ =image_tag("logo-426px-mauve-matte.png")
+ %h2 collaborative decision-making
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 6093b260d67..584e0222ad9 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,17 +1,31 @@
-.inner-container
- %h1 Sign in
- = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
- = f.label :email, "Email"
- = f.email_field :email
- = f.label :password, "Password"
- = f.password_field :password
- - if devise_mapping.rememberable?
- = f.check_box :remember_me
- = f.label :remember_me, "Remember me", class: "checkbox-label"
- .sign-in-button
- = f.submit "Sign in", class: "btn btn-info small", :id => "sign-in-btn"
- = render :partial => "devise/shared/links"
- .row
- .span11.sub-header.style-grey
- %p Don't have an account? We're currently in closed testing and not accepting public sign-ups (yet!).
- %p.style-grey If you belong to a group that is using Loomio but you don't have your own Loomio account, please contact the person in your organization who set up Loomio and ask them to add you to the group.
+.container
+ .section#sign-in
+ .inner-container
+ .row-fluid
+ .subhead
+ .span1
+ .span4
+ %h2 Sign in
+
+ .row-fluid
+ .span1
+ .span4
+ = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+ = f.label :email, "Email"
+ = f.email_field :email
+ = f.label :password, "Password"
+ = f.password_field :password
+ - if devise_mapping.rememberable?
+ = f.check_box :remember_me, class: "pull-left"
+ = f.label :remember_me, "Remember me", class: "checkbox-label"
+ .sign-in-button
+ = f.submit "Sign in", class: "btn btn-info btn-large", :id => "sign-in-btn"
+ = render :partial => "devise/shared/links"
+
+ .span1
+ .span5
+ %p
+ %strong Don't have an account?
+ %br
+ We're currently in closed testing and not accepting public sign-ups (yet!).
+ %p If you belong to a group that is using Loomio but you don't have your own Loomio account, please contact the person in your organization who set up Loomio and ask them to add you to the group.
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 887d61af830..619a0f0a6d0 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -21,16 +21,14 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
- %body{class: "#{controller_name} #{action_name}"}
- - on_landing_page = true if controller_name == "pages" || controller_name == "sessions"
- - supported = true unless params[:id] == 'browser_not_supported'
- - if on_landing_page && supported
- .main-container.container
- = render "fork_us_github"
- = render 'flash_messages', :flash => flash, :on_landing_page => true
- = render "header_logged_out"
- = yield
+ %body{class: "#{controller_name} #{action_name}"}
+ - outside_app = true if controller_name == "pages" || controller_name == "sessions" || params[:id] == 'browser_not_supported'
+ -if outside_app
+ .container.home-flash
+ = render 'flash_messages', :flash => flash
+ = render "header_logged_out"
+ = yield
-else
.main-container.container
= render 'header', :notifications => @notifications,
diff --git a/app/views/pages/about.html.haml b/app/views/pages/about.html.haml
deleted file mode 100644
index b52c385d101..00000000000
--- a/app/views/pages/about.html.haml
+++ /dev/null
@@ -1,40 +0,0 @@
-.content
- .row
- .span6
- .inner-container
- %h2 Where did Loomio come from?
- %p
- Something interesting happened in 2011. Millions of people all over the world took part in a wave of pro-democracy movements, demanding a change in the way our biggest institutions operate.
- %p
- Loomio is what happened when a bunch of activists from the Occupy movement and businesspeople from a social enterprise network called Enspiral realised that they were using different approaches to work towards the same aim: a more sustainable and equitable world.
- %p
- The Loomio project is about individual voices contributing to collective action: enabling all people to have a say in decisions that affect them in all aspects of life – in their community, their workplace, and the world.
- %p
- Loomio is being built by a team of passionate volunteers in Wellington, New Zealand, and a wider network of friends and supporters all over the world. We’re operating on a non-profit basis, but recognise that Loomio needs to be self-sufficient long term to have as much positive social impact as possible. We’re currently figuring out the fairest way of charging groups who have a budget to pay for helpful tools, so we can help groups who are doing great stuff in the community with no budget.
- .span6
- .inner-container
- %h2 Who’s using Loomio?
- %p
- Loomio is currently being used by about 260 groups. Here’s a few examples:
- %ul.about
- %li
- %a{ :href => "http://enspiral.com"}
- Enspiral
- is using Loomio to make business decisions and collaboratively write their employment contracts.
- %li
- %a{ :href=> "http://devblog.joindiaspora.com/2012/09/19/community-check-in-how-are-we-doing/"}
- Diaspora
- , the massively anticipated open-source social network project, is using Loomio to transition to a community-driven governance model.
- %li
- The
- %a{ :href => "http://concernedcitizens.co.nz"}
- Concerned Citizens Trust
- is using Loomio to collectively approve exhibition proposals at their Open-Source Community Gallery.
- %li
- Loomio is being used to make decisions about the development of Loomio itself.
- %br
- %br
- %h3
- “Loomio gives an opportunity for our people to express their own thoughts, ideas, and needs. That room for discussion has helped the community get on the same page about what’s important.”
- %p
- – Sean Tilley, Community Manager, Diaspora.
diff --git a/app/views/pages/blog.html.haml b/app/views/pages/blog.html.haml
index 8ba8444f951..6339160df87 100644
--- a/app/views/pages/blog.html.haml
+++ b/app/views/pages/blog.html.haml
@@ -1,4 +1,11 @@
-%div{style: "text-align: center; padding-top: 15px;"}
- %h2 Blog is temporarily down
- %p{style: "font-size: 1.1em; margin-top: 10px;"} We're in the process of transitioning servers, so our blog is currently disabled. Sorry, we'll have it back up again in a few days!
- %p= link_to "Read more about Loomio", "/how-it-works"
\ No newline at end of file
+= render "header_logged_out"
+
+.container
+ .section
+ .inner-container
+ .row-fluid
+ .span2
+ .span8
+ %h2 Blog is temporarily down
+ %p Our blog is currently disabled. Sorry, we'll have it back up again soon!
+ %p= link_to "Read more about Loomio", "/"
diff --git a/app/views/pages/browser_not_supported.html.haml b/app/views/pages/browser_not_supported.html.haml
index 7d1b98421eb..8d0cbc7da7a 100644
--- a/app/views/pages/browser_not_supported.html.haml
+++ b/app/views/pages/browser_not_supported.html.haml
@@ -1,36 +1,38 @@
-%a{href: "/"}
- .header
-.content
- .notice
- %p
- Oops! It seems the browser you are using is too old and unable to run on this website.
- %p
- Any new version of the browsers listed below should work fine, they are free and easy to download/install.
- %p
- Sorry for any inconvenience!
- %ul#browser-icons
- %a{href: "http://www.mozilla.org/en-US/firefox/new/"}
- %li
- =image_tag '/assets/firefox.png'
- %p.browser-title
- Firefox
- %a{href: "https://www.google.com/chrome"}
- %li
- =image_tag '/assets/chrome.png'
- %p.browser-title
- Google Chrome
- %a{href: "http://www.apple.com/safari/"}
- %li
- =image_tag '/assets/safari.png'
- %p.browser-title
- Safari
- %a{href: "http://www.opera.com/"}
- %li
- =image_tag '/assets/opera.png'
- %p.browser-title
- Opera
- %a{href: "http://windows.microsoft.com/en-US/internet-explorer/products/ie/home"}
- %li
- =image_tag '/assets/ie.png'
- %p.browser-title
- Internet Explorer
+.container
+ .section
+ .inner-container
+ .row-fluid
+ .subhead
+ %h2 Browser not supported
+
+ .row-fluid
+ %p
+ Oops! It seems the browser you are using is too old and unable to run on this website.
+ %p
+ Any new version of the browsers listed below should work fine, they are free and easy to download/install.
+ %p
+ Sorry for any inconvenience!
+
+ %ul#browser-icons
+ %a{href: "http://www.mozilla.org/en-US/firefox/new/"}
+ %li
+ Firefox
+ =image_tag '/assets/firefox.png'
+ %a{href: "https://www.google.com/chrome"}
+ %li
+ Google Chrome
+ =image_tag '/assets/chrome.png'
+ %a{href: "http://www.apple.com/safari/"}
+ %li
+ Safari
+ =image_tag '/assets/safari.png'
+ %a{href: "http://www.opera.com/"}
+ %li
+ Opera
+ =image_tag '/assets/opera.png'
+ %a{href: "http://windows.microsoft.com/en-US/internet-explorer/products/ie/home"}
+ %li
+ Internet Explorer
+ =image_tag '/assets/ie.png'
+
+
diff --git a/app/views/pages/contact.html.haml b/app/views/pages/contact.html.haml
deleted file mode 100644
index 59a6c296fc7..00000000000
--- a/app/views/pages/contact.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-.content
- .row
- .span12
- .inner-container
- %h2 We’d love to hear from you
- %p
- Interested? Get in touch! If you’d like to get involved or just want to find out more, drop us a line at
- %a{ :href => "mailto:contact@loomio.org"}
- contact@loomio.org
- %p
- If you’d rather speak to someone directly, you can call Ben on +6421 0232 5433.
- %p
- =image_tag("retreat-photo.jpg", :width => "100%")
\ No newline at end of file
diff --git a/app/views/pages/demo.html.haml b/app/views/pages/demo.html.haml
deleted file mode 100644
index d42db0ab803..00000000000
--- a/app/views/pages/demo.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-%a{href: "/"}
- .header
-.content#demo-container
- #demo-head
- %h1
- Demo Page
- #demo-content
- %h2
- Looking for a snapshot of how Loomio works now? You've come to the right page.
- %p
- The best way to see how Loomio works right now is to have a look at how we're using it. We've made our Loomio Development group public so that you can see how we use the tool to discuss and make decisions about how to build the tool. Have a look here:
- %a{:href => "http://loomio.org/groups/3",
- :class => "demo-link"}Loomio Development Group
- %p
- Keep in mind that Loomio is in the early alpha phase - that means we're constantly changing it, experimenting, and sometimes breaking it. We still have some work to do before our basic vision of the tool will be realized, but we're adding new features all the time.
- %p
- Our immediate goal is to get Loomio to the stage where we can release it to a wider user base and nurture a community whose feedback will decide the future of development, using Loomio itself to make decisions about itself.
- %p
- You can also view the Loomio group for "19 Tory Street", an open-source community gallery project based in Wellington, New Zealand that has been an early tester of Loomio.
- %a{:href => "http://loomio.org/groups/25",
- :class => "demo-link"}19 Tory Street Loomio Group
- %p
- If you would like to get in touch, you can reach us at
- %a{:href => "#"}contact@loomio.org
- ,
- %a{:href => "http://www.facebook.com/LoomioProject"}facebook
- , and
- %a{:href => "http://twitter.com/#!/loomioproject"}twitter.
diff --git a/app/views/pages/get_involved.html.haml b/app/views/pages/get_involved.html.haml
deleted file mode 100644
index 91c1256c4e5..00000000000
--- a/app/views/pages/get_involved.html.haml
+++ /dev/null
@@ -1,30 +0,0 @@
-.content
- .row
- .span6
- .inner-container
- %h2 Want to use Loomio?
- %p
- Loomio is in closed beta. This means we’re still in development, and have limited resources for user support.
- %p
- We’re currently bringing on ‘learning partner’ groups one at a time. These are groups who are keen to try out a new tool and give us feedback about how they think it should be developed.
- %p
- If your group would like early access,
- %a{ :href => "/request_new_group"} click here to get in the door.
- ! If you’d rather wait until Loomio is ready for public release,
- click here to get on the waiting list.
-
- .span6
- .inner-container
- %h2 Want to help the project?
- %p
- Loomio has been entirely developed by volunteers. We believe in the project’s potential to have great positive social impact; it’s going to need resources to get there.
- %h3 Volunteers
- %p
- If you’re keen to get involved with the project,
- %a{ :href => page_path('contact'), :title => "Contact"}
- get in touch
- and tell us about your skills and interests!
- %h3 Developers
- %p
- Loomio is an open source project developed in Ruby on Rails. If you know Rails or have experience with front-end web development,
- click here to start contributing!
diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml
index 22de827b613..1de89ef8575 100644
--- a/app/views/pages/home.html.haml
+++ b/app/views/pages/home.html.haml
@@ -1,22 +1,203 @@
-.content
- .row
- .span12
- .inner-container
- %h2 An online tool for collaborative decision-making.
- %p.text-error
- "Groups of all sizes make better decisions when all voices are heard, so we’re building a system that makes it easy and efficient for anyone to participate in decisions that affect them."
- %br
- .row
- .span6
- .inner-container
- %h3 Exciting News!
- %p
- After nine months of hard work developing Loomio, we’re excited to move into a new phase where we can start bringing new groups on board.
- %p
- We’ve learned a lot from our first 1000 users and we’re really proud of what we’ve built so far – a user-friendly tool that makes it easy and efficient for groups to make good decisions together online.
- %p
- If you’re part of a group that wants to get in the door and start making good decisions together online,
- %a{ :href => "http://loomio.org/request_new_group" } click here!
- .span6
- %p#loomio-project-iframe
-
\ No newline at end of file
+.container
+ .section
+ .inner-container
+ .row-fluid
+ .span6
+ %h2.buffer Welcome to Loomio
+ %p Loomio is a collaborative decision-making tool.
+ %p Loomio reduces the cost of participation in decision-making, making it easy for any group to translate online communication into real-world collective action.
+ %p We're in 'private beta', which means we're not accepting public sign-ups yet. If you want to get involved early, click here:
+ %p.no-bottom-margin
+ %a.btn.btn-large.btn-primary{href: request_new_group_path} Sign up to be a beta tester
+ .span6
+ %h2.buffer
+
+
+ .anchor#why
+ .section#purpose
+ .inner-container
+ .row-fluid
+ .subhead
+ %h1 Purpose
+ .row-fluid
+ .span1
+ .span2
+ =image_tag("circlelogo.png")
+ .span6
+ %h2.buffer Creating a world where it’s easy for anyone to participate in decisions that affect them.
+ %p With the right collaborative process, groups generate better ideas, decisions and actions than any individual would by themselves.
+ %p Loomio breaks down the barriers to participation in decision-making at every level: in neighbourhoods, community organisations, businesses, social movements, and local and national governance.
+ %p.no-bottom-margin Collaborative decision-making balances individual autonomy with the collective good.
+
+ .section#principles
+ .inner-container
+ .row-fluid
+ .subhead
+ %h1 Principles
+ .row-fluid#coop
+ .span1
+ .span2
+ =image_tag("coop.png")
+ .span6
+ %h2 Cooperative social enterprise
+ %h3 Loomio is a social enterprise collectively owned by the people building it.
+ %p Social enterprise creates social and environmental benefit in a way that generates sustainable revenue. Unlike a traditional profit-maximising company, revenue is not an end in itself, but a means towards achieving a core social purpose.
+ %p A worker-owned cooperative structure is a powerful way to live our values of collaboration and collective ownership. This legal structure embodies our commitment to democracy in the workplace and connects us to a global movement based on cooperation.
+ / .more-link
+ / .toggle
+ / %a{"data-toggle" => "collapse", "data-target" => "#ml1"}
+ / More
+ / .collapse.in#ml1
+ / %ul
+ / %li
+ / %i.icon-cog
+ / %a{href: "http://github.com/enspiral/loomio"}
+ / Fork Loomio on Github
+ / %li
+ / %i.icon-file
+ / %a{href:"www.aljazeera.com/indepth/opinion/2012/03/2012361233474499.html"}
+ / Michel Bauwens on peer-production
+ / %li
+ / %i.icon-facetime-video
+ / %a{}
+ / Panel discussion on peer-production
+ .divider
+ .row-fluid
+ .span1
+ .span2
+ =image_tag("independent.png")
+ .span6
+ %h2 Independent and neutral
+ %h3 We are committed to remaining independent so we can provide a neutral place for any group to come together.
+ %p We’re immensely proud of our diverse and growing user community: community organisations, businesses, educators, government departments, social activist groups, and families.
+ %p Loomio needs to remain independent to support this diversity. We will never do anything to compromise our autonomy or core purpose. We will never sell your data.
+ .divider
+ .row-fluid#free
+ .span1
+ .span2
+ =image_tag("free.png")
+ .span6
+ %h2 Open-source collaboration
+ %h3 Loomio is free software, meaning that anyone has the freedom to run, read, learn from, modify and redistribute the code.
+ %p Loomio couldn’t be anything other than open-source.
+ %p Peer-production is transforming the way communities create value, laying the foundation for a new economy of abundance. Open collaboration unlocks collective wisdom on a scale we’ve never seen before, producing invaluable public resources like Wikipedia and Linux.
+ %p Free software is about the freedom of the user, not the price of the service. Groups with a budget contribute financially for the use of Loomio. This means we can gift it to groups without a budget.
+ .divider
+ .row-fluid#adaptive
+ .span1
+ .span2
+ =image_tag("adaptive.png")
+ .span6
+ %h2.squish Adaptive, reflexive, user-driven
+ %h3 Loomio uses Loomio to develop Loomio.
+ %p Development of Loomio is iterative, self-reflexive and adaptive, driven by the collective wisdom of the user community. We’re developing an open participatory design methodology that will allow anyone affected by Loomio to have a say in how it works.
+ .divider
+ .row-fluid
+ .span1
+ .span2
+ =image_tag("transparency.png")
+ .span6
+ %h2 Transparency
+ %h3 Our community of users and contributors must be confident that we’re doing what we say we are.
+ %p.no-bottom-margin We’re committed to remaining open and accountable to our community by sharing information about our internal decision-making, social impact results and finances. Communicating this information effectively is an ongoing challenge that we look forward to undertaking with our community.
+
+ .anchor#how
+ .section#how-it-works
+ .inner-container
+ .row-fluid
+ .subhead
+ %h1 How it works
+ .row-fluid
+ .span6
+ %h2 Loomio is easy
+ %p Check out the video for a quick demonstration of how it works.
+ .span6
+
+ .divider
+ .row-fluid
+ .span6
+ %h2 Getting started
+ %p On the left, the group discusses a topic, exchanging ideas and information. When there’s a decision for the group to make, it comes up on the right.
+ .span6
+ %a{"data-toggle" => "modal", href: "#hiw1"}
+ =image_tag("how-it-works-overview-ss.jpg")
+ .modal.hide#hiw1
+ .modal-body
+ %a{"data-dismiss" => "modal"}
+ =image_tag("how-it-works-overview-big.jpg")
+ .divider
+ .row-fluid
+ .span6
+ %h2 Have a discussion
+ %p The topic and any relevant background information sit at the top of the page. Use the comment box to add your voice to the discussion.
+ .span6
+ %a{"data-toggle" => "modal", href: "#hiw2"}
+ =image_tag("how-it-works-discussion-ss.jpg")
+ .modal.hide#hiw2
+ .modal-body
+ %a{"data-dismiss" => "modal"}
+ =image_tag("how-it-works-discussion-big.jpg")
+ .divider
+ .row-fluid
+ .span6
+ %h2 Make a decision
+ %p When the conversation has gone on for a while, anyone can make a proposal. When you’re ready to have your say, click one of the four decision buttons:
+ .positions
+ =image_tag("hand-yes.png", class: "pull-left")
+ %p Agree means you’re happy with the proposal.
+ .clearfix
+ =image_tag("hand-abstain.png", class: "pull-left")
+ %p Abstain means you’re unsure, or you’re happy for the group to decide without you.
+ =image_tag("hand-no.png", class: "pull-left")
+ %p Disagree means you think there might be a better alternative, but you’re willing to go with the group’s decision.
+ =image_tag("hand-block.png", class: "pull-left")
+ %p Block means you’ve got serious objections and you’ll be extremely unhappy if this proposal goes ahead.
+ .span6
+ %a{"data-toggle" => "modal", href: "#hiw3"}
+ =image_tag("how-it-works-decision-ss.jpg")
+ .modal.hide#hiw3
+ .modal-body
+ %a{"data-dismiss" => "modal"}
+ =image_tag("how-it-works-decision-big.jpg")
+ .divider
+ .row-fluid
+ .span6
+ %h2 See how everyone feels
+ %p When you’ve made your decision, you’ll be prompted to give a brief summary statement explaining why you feel that way. Underneath the pie, you can see how other people in the group have decided. These short statements make it really easy to catch up with where the discussion is up to.
+ .span6
+ %a{"data-toggle" => "modal", href: "#hiw4"}
+ =image_tag("how-it-works-position-ss.png")
+ .modal.hide#hiw4
+ .modal-body
+ %a{"data-dismiss" => "modal"}
+ =image_tag("how-it-works-position-big.jpg")
+ .divider
+ .row-fluid
+ .span6
+ %h2 Build shared understanding
+ %p As the conversation progresses and new information comes to light, you can change your position as many times as you like until the proposal closes. If the group isn’t in love with the first proposal, anyone can suggest a better one and keep moving forward.
+ %p Through this dynamic process, the collective wisdom of your group can generate better ideas than anyone would have come up with on their own.
+ .span6
+ =image_tag("mascot-wide.gif", class: "no-bottom-margin")
+
+ .anchor#who
+ .section
+ .inner-container
+ .row-fluid
+ .subhead
+ %h1 About us
+ .row-fluid
+ .span6
+ %p Loomio emerged when activists from the Occupy movement collided with businesspeople from the social enterprise network Enspiral and realised that they were using different approaches to work towards the same aim.
+ %p Loomio is being built by a core team in Wellington, New Zealand, and a wider network of friends and supporters all over the world. This video is a presentation by one of the team members that explains some of the background of the project.
+ .span6
+
+ .divider
+ .row-fluid
+ .span6
+ =image_tag("retreat-photo.jpg")
+ .span6
+ %h2 Contact
+ %h3 Interested? Get in touch!
+ %p If you’d like to find out more about the project, drop us a line at contact@loomio.org
+ %p If you’d rather speak to someone directly, you can call Ben on +6421 0232 5433.
diff --git a/app/views/pages/how_it_works.html.haml b/app/views/pages/how_it_works.html.haml
deleted file mode 100644
index 74dd338af8b..00000000000
--- a/app/views/pages/how_it_works.html.haml
+++ /dev/null
@@ -1,64 +0,0 @@
-.content
- .row.how-it-works-panel
- .span6
- .inner-container
- %h3 Loomio is easy
- %p Loomio is an app for collaborative decision-making. Check out the video for a quick demonstration of how it works.
-
- .span6
-
-
- %hr
- .row.how-it-works-panel
- .span6
- .inner-container
- %h3 Getting started
- %p On the left, the group discusses a topic, exchanging ideas and information. When there’s a decision for the group to make, it comes up on the right.
- .span6
- =image_tag("how-it-works-overview-ss.jpg")
- %hr
- .row.how-it-works-panel
- .span6
- .inner-container
- %h3 Have a discussion
- %p The topic and any relevant background information sit at the top of the page. Use the comment box to add your voice to the discussion.
- .span6
- =image_tag("how-it-works-discussion-ss.jpg")
-%hr
- .row.how-it-works-panel
- .span6
- .inner-container
- %h3 Make a decision
- %p When the conversation has gone on for a while, anyone can make a proposal. When you’re ready to have your say, click one of the four decision buttons:
- .position-icons
- =image_tag("hand-yes.png")
- %p Agree means you’re happy with the proposal.
- =image_tag("hand-abstain.png")
- %p Abstain means you’re unsure, or you’re happy for the group to decide without you.
- =image_tag("hand-no.png")
- %p Disagree means you think there might be a better alternative, but you’re willing to go with the group’s decision.
- =image_tag("hand-block.png")
- %p.special-last Block means you’ve got serious objections and you’ll be extremely unhappy if this proposal goes ahead.
-
- .span6
- =image_tag("how-it-works-decision-ss.jpg")
-
-%hr
- .row.how-it-works-panel
- .span6
- .inner-container
- %h3 See how everyone feels
- %p When you’ve made your decision, you’ll be prompted to give a brief summary statement explaining why you feel that way. Underneath the pie, you can see how other people in the group have decided. These short statements make it really easy to catch up with where the discussion is up to.
- .span6
- =image_tag("how-it-works-position-ss.jpg")
-
-%hr
- .row.how-it-works-panel
- .span6
- .inner-container
- %h3 Build shared understanding
- %p As the conversation progresses and new information comes to light, you can change your position as many times as you like until the proposal closes. If the group isn’t in love with the first proposal, anyone can suggest a better one and keep moving forward.
- %p Through this dynamic process, the collective wisdom of your group can generate better ideas than anyone would have come up with on their own.
- .span6
- =image_tag("mascot-wide.gif")
-%hr
\ No newline at end of file
diff --git a/app/views/pages/privacy.html.haml b/app/views/pages/privacy.html.haml
index 703db17efed..2b0e7c7fc24 100644
--- a/app/views/pages/privacy.html.haml
+++ b/app/views/pages/privacy.html.haml
@@ -1,17 +1,21 @@
-.row
- .span8.offset2
- %h2 Privacy Policy
+.container
+ .section
+ .inner-container
+ .row-fluid
+ .span2
+ .span8
+ %h2 Privacy Policy
- %p We don't want you to get a surprise that you've shared something you intended to keep private. You have full control over the visibility of your data.
+ %p We don't want you to get a surprise that you've shared something you intended to keep private. You have full control over the visibility of your data.
- %p You have the ability to make your groups private, in which case only group members can view the content of your discussions and decisions. Private groups are not visible in search.
+ %p You have the ability to make your groups private, in which case only group members can view the content of your discussions and decisions. Private groups are not visible in search.
- %p Regardless of your group privacy settings, your email address is only visible to members of your group, not to the public.
+ %p Regardless of your group privacy settings, your email address is only visible to members of your group, not to the public.
- %p Access to your data is tightly controlled internally, and we will never view the content of your private discussions without your explicit consent. We do collect non-directly-identifiable usage information to help us improve the software, in accordance with our social mission. All usage information is stored in a secure data warehouse facility.
+ %p Access to your data is tightly controlled internally, and we will never view the content of your private discussions without your explicit consent. We do collect non-directly-identifiable usage information to help us improve the software, in accordance with our social mission. All usage information is stored in a secure data warehouse facility.
- %p You own your data. If you ever want to stop using Loomio, you will be able to download your data - ask our team and we will extract the data for you.
+ %p You own your data. If you ever want to stop using Loomio, you will be able to download your data - ask our team and we will extract the data for you.
- %p Your data is not shared to any third parties without your explicit consent by either communication or by API authentication.
+ %p Your data is not shared to any third parties without your explicit consent by either communication or by API authentication.
- %p We reserve the right to change this policy from time to time. Any amended policy is effective upon posting to this website, and we’ll make every effort to tell you about these changes via email.
\ No newline at end of file
+ %p We reserve the right to change this policy from time to time. Any amended policy is effective upon posting to this website, and we’ll make every effort to tell you about these changes via email.
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 8df1d079b77..c491d17da01 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -86,11 +86,20 @@
end
root :to => 'high_voltage/pages#show', :id => 'home'
- match '/demo' => 'high_voltage/pages#show', :id => 'demo'
match '/browser_not_supported' => 'high_voltage/pages#show', :id => 'browser_not_supported'
- match '/how-it-works' => 'high_voltage/pages#show', :id => 'how_it_works'
- match '/get-involved' => 'high_voltage/pages#show', :id => 'get_involved'
- match '/about' => 'high_voltage/pages#show', :id => 'about'
- match '/contact' => 'high_voltage/pages#show', :id => 'contact'
+ match '/privacy' => 'high_voltage/pages#show', :id => 'privacy'
match '/blog' => 'high_voltage/pages#show', :id => 'blog'
+
+ #redirect old pages:
+ match '/pages/how-it-works' => redirect('/')
+ match '/pages/get-involved' => redirect('/')
+ match '/pages/about' => redirect('/')
+ match '/pages/contact' => redirect('/')
+ match '/pages/blog' => redirect('/blog')
+ match '/pages/privacy' => redirect('/privacy')
+ match '/how-it-works' => redirect('/')
+ match '/get-involved' => redirect('/')
+ match '/about' => redirect('/')
+ match '/contact' => redirect('/')
+ match '/demo' => redirect('/')
end