contour 0.10.2 → 1.0.0.beta

data/app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee

@@ -0,0 +1,5 @@
+jQuery ->
+  $("a[rel=popover]").popover()
+  $(".tooltip").tooltip()
+  $("a[rel=tooltip]").tooltip()
+  $('.dropdown-toggle').dropdown()

data/app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -0,0 +1,29 @@
+@import "twitter/bootstrap/bootstrap";
+body { padding-top: 60px; }
+
+@import "twitter/bootstrap/responsive";
+
+// Set the correct sprite paths
+@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
+@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
+
+// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
+@fontAwesomeEotPath: asset-path('fontawesome-webfont.eot');
+@fontAwesomeWoffPath: asset-path('fontawesome-webfont.woff');
+@fontAwesomeTtfPath: asset-path('fontawesome-webfont.ttf');
+@fontAwesomeSvgzPath: asset-path('fontawesome-webfont.svgz');
+@fontAwesomeSvgPath: asset-path('fontawesome-webfont.svg');
+
+// Font Awesome
+@import "fontawesome";
+
+// Your custom LESS stylesheets goes here
+//
+// Since bootstrap was imported above you have access to its mixins which
+// you may use and inherit here
+//
+// If you'd like to override bootstrap's own variables, you can do so here as well
+// See http://twitter.github.com/bootstrap/less.html for their names and documentation
+//
+// Example:
+// @linkColor: #ff0000;

data/app/assets/stylesheets/contour.css

@@ -3,13 +3,8 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
+ *= require bootstrap_and_overrides
  *= require jquery-ui-1.8.10.custom
- *= require bluetrip-screen
- *= require contour/global
- *= require contour/header
- *= require contour/message
- *= require contour/menu
- *= require contour/popup
+ *= require jquery.qtip
  *= require contour/authentication
- *= require_tree . 
-*/
+*/

data/app/assets/stylesheets/contour/authentication.css

@@ -60,4 +60,4 @@
   margin-right: 20px;
   text-align: center;
   margin-bottom: 10px;
-}
+}

data/app/controllers/contour/registrations_controller.rb

@@ -2,16 +2,20 @@ class Contour::RegistrationsController < Devise::RegistrationsController
   prepend_before_filter :require_no_authentication, only: [ :new ]
 
   def create
-    if user_signed_in?
-      params[:user][:password] = params[:user][:password_confirmation] = Digest::SHA1.hexdigest(Time.now.usec.to_s)[0..19]
+    if signed_in?
+      # TODO: Should use "Resource" and not "User"
+      params[:user][:password] = params[:user][:password_confirmation] = Digest::SHA1.hexdigest(Time.now.usec.to_s)[0..19] if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
       @user = User.new(params[:user])
       if @user.save
-        [:pp_committee, :pp_committee_secretary, :steering_committee, :steering_committee_secretary, :system_admin, :status].each do |attribute|
-          @user.update_attribute attribute, params[:user][attribute]
+        respond_to do |format|
+          format.html { redirect_to @user, notice: 'User was successfully created.' }
+          format.json { render json: @user, only: [:id, :email], status: :created, location: @user }
         end
-        redirect_to @user, notice: 'User was successfully created.'
       else
-        render action: "/users/new"
+        respond_to do |format|
+          format.html { render action: "/users/new" }
+          format.json { render json: @user.errors, status: :unprocessable_entity}
+        end
       end
     else
       super

data/app/views/contour/authentications/_menu.html.erb

@@ -1,10 +1,10 @@
 <% PROVIDERS.each do |provider| %>
-  <% url_params = (provider == :google_apps) ? '?domain=gmail.com' : '' %>
   <% provider_name = OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize %>
   <% image_name = provider.to_s.downcase %>
-  <li class="parent li_right" style="top:-4px;height:20px;">
-    <a href="<%= request.script_name %><%= "/" + OmniAuth.config.path_prefix.split('/').last.to_s %><%= "/" + provider.to_s.downcase %><%= url_params %>" class="noicon">
+  <li>
+    <a href="<%= request.script_name %><%= "/" + OmniAuth.config.path_prefix.split('/').last.to_s %><%= "/" + provider.to_s.downcase %>" class="noicon">
       <%= image_tag "contour/#{image_name}_32.png", align: 'absmiddle', height: "28px", title: provider_name %>
+      <%= provider_name %>
     </a>
   </li>
-<% end %>
+<% end %>

data/app/views/contour/confirmations/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.submit "Resend confirmation instructions" %></div>
+<% end %>
+
+<%= render "links" %>

data/app/views/contour/layouts/_menu.html.erb

@@ -1,28 +1,45 @@
-<% display = ['not_signed_in', 'always'] %>
-<% if user_signed_in? -%>
-  <% display = ['signed_in', 'always'] %>
-<% end %>
-
-<ul class="ul-menu">
-  <% Contour.menu_items.each do |menu_item| %>
-    <% if display.include?(menu_item[:display]) and (menu_item[:condition].blank? or eval(menu_item[:condition])) %>
-      <li class="parent li_<%= menu_item[:position] %>">
-        <%= link_to_if (not menu_item[:path].blank?), (menu_item[:eval] ? eval(menu_item[:name]) : menu_item[:name].html_safe + (menu_item[:image].blank? ? '' : image_tag(menu_item[:image], menu_item[:image_options]))), eval(menu_item[:path].to_s), class: 'noicon', target: menu_item[:target] %>
-        <% if menu_item[:links].size > 0 %>
-          <ul>
-          <% menu_item[:links].each do |link| %>
-            <% if link[:condition].blank? or eval(link[:condition]) %>
-              <% if link[:html].blank? %>
-                <li><%= link_to_if (not link[:path].blank?), (link[:eval] ? eval(link[:name]) : link[:name].html_safe + (link[:image].blank? ? '' : image_tag(link[:image], link[:image_options]))), eval(link[:path].to_s), class: 'noicon', target: link[:target] %></li>
-              <% else %>
-                <li><%= link[:eval] ? eval(link[:html]).html_safe : link[:html].html_safe %></li>
-              <% end %>
+<div class="navbar-inner">
+  <div class="container">
+    <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </a>
+    <%= link_to Contour.application_name.html_safe, root_path, class: 'brand' %>
+    <div class="nav-collapse">
+      <% display = signed_in? ? ['signed_in', 'always'] : ['not_signed_in', 'always'] %>
+      <% Contour.menu_items.group_by{|i| i[:position]}.each do |position, items| %>
+        <ul class="nav <%= 'pull-right' if position == 'right' %>">
+          <% items.each_with_index do |menu_item, index| %>
+            <% has_submenu = (menu_item[:links] || []).size > 0 %>
+            <% if display.include?(menu_item[:display]) and (menu_item[:condition].blank? or eval(menu_item[:condition])) %>
+              <li class="<%= 'dropdown' if has_submenu %>" id="menu<%= position %><%= index %>">
+                <%= link_to(
+                    (menu_item[:eval] ? eval(menu_item[:name]) : menu_item[:name].html_safe + (menu_item[:image].blank? ? '' : image_tag(menu_item[:image], menu_item[:image_options]))),
+                    (menu_item[:path].blank? ? '#' : eval(menu_item[:path].to_s)),
+                    target: menu_item[:target], style: "#{ 'display:inline-block;padding-right:0px' if has_submenu }")
+                     %>
+                <%= link_to "<b class='caret'></b>".html_safe, '#', 'data-target' => "#menu#{position}#{index}", class: 'dropdown-toggle', 'data-toggle' => 'dropdown', style: 'display:inline-block;padding-left:0px' if has_submenu %>
+                <% if menu_item[:links].size > 0 %>
+                  <ul class="dropdown-menu">
+                  <% menu_item[:links].each do |link| %>
+                    <% if link[:condition].blank? or eval(link[:condition]) %>
+                      <% if link[:divider] == true %>
+                        <li class="divider"></li>
+                      <% elsif link[:authentications] == true %>
+                        <%= render partial: 'contour/authentications/menu' %>
+                      <% else %>
+                        <li><%= link_to (link[:eval] ? eval(link[:html].blank? ? link[:name] : link[:html].html_safe) : (link[:html].blank? ? link[:name] : link[:html].html_safe) + (link[:image].blank? ? '' : image_tag(link[:image], link[:image_options]))).html_safe, link[:path].blank? ? '#' : eval(link[:path].to_s), target: link[:target] %></li>
+                      <% end %>
+                    <% end %>
+                  <% end %>
+                  </ul>
+                <% end %>
+              </li>
             <% end %>
           <% end %>
-          </ul>
-        <% end %>
-      </li>
-    <% end %>
-  <% end %>
-  <%= render partial: 'contour/authentications/menu' unless user_signed_in? %>
-</ul>
+        </ul>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/contour/layouts/application.html.erb

@@ -3,9 +3,13 @@
 <head>
   <title><%= [Contour.application_name, @title].compact.join(' - ').html_safe %></title>
   <%= favicon_link_tag %>
-  <%= stylesheet_link_tag    "application", media: "all" %>
+  <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+  <![endif]-->
+  <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <style type="text/css">
     body {
       <%= "background-image: url(#{image_path(Contour.body_background_image_select) rescue ''});" unless Contour.body_background_image_select.blank? %>
@@ -19,6 +23,8 @@
 </head>
 <body>
   <%= javascript_tag "var root_url='#{request.script_name + '/'}';var auth_token='#{form_authenticity_token}';" %>
+
+<% if false %>
   <div id="header" class="container" <%= "style='background-image: url(#{request.script_name}/assets/#{Contour.header_background_image});'" unless Contour.header_background_image.blank? %>>
     <%= image_tag(Contour.header_title_image, alt: '', style: 'vertical-align:middle') unless Contour.header_title_image.blank? %>
     <%= link_to (Contour.application_name_html.blank? ? Contour.application_name : Contour.application_name_html.html_safe), root_path, style: 'text-decoration:none;', onmouseover: "$('#version').show();", onmouseout: "$('#version').hide();" %>
@@ -30,26 +36,14 @@
       <%= render partial: 'contour/layouts/message' %>
     </div>
   </div>
+<% end %>
 
-  <div style="height:29px">
-    <div id="menu" class="container shadow">
-      <%= render partial: 'contour/layouts/menu' %>
-    </div>
+  <div class="navbar navbar-fixed-top">
+    <%= render partial: 'contour/layouts/menu' %>
   </div>
 
-  <div id="content" class="container">
+  <div class="container">
     <%= yield %>
   </div>
-
-  <div id="popup" style="overflow-y: hidden;">
-    <div id="popup_header" style="padding: 12px;">
-      <div style="float:right;margin-right:10px; margin-top:-4px"><%= image_tag(Contour.header_title_image, alt: '') unless Contour.header_title_image.blank?  %></div>
-      <a id="popup_close">x</a>
-      <h1 id="popup_title"></h1>
-    </div>
-    <div id="popup_content"></div>
-  </div>
-
-  <div id="background_popup"></div>
 </body>
 </html>

data/app/views/contour/passwords/edit.html.erb

@@ -1,16 +1,16 @@
 <h2>Change your password</h2>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
 
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
+  <div><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password %></div>
 
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
+  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></div>
 
-  <p><%= f.submit "Change my password" %></p>
+  <div><%= f.submit "Change my password" %></div>
 <% end %>
 
-<%= render partial: "devise/shared/links" %>
+<%= render "links" %>

data/app/views/contour/passwords/new.html.erb

@@ -1,19 +1,12 @@
-<% @title = 'Forgot your password?' %>
+<h2>Forgot your password?</h2>
 
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
-  <fieldset style="width:235px">
-    <legend><%= @title %></legend>
 
-    <div class="field">
-      <%= f.label :email %><br />
-      <%= f.text_field :email %>
-    </div>
-  </fieldset>
-  <div class="actions">
-    <% form_name = "new_#{resource.class.name.underscore}" %>
-    <%= link_to_function image_tag('contour/tick.png', alt: '') + "Send me reset password instructions", "$('##{form_name}').submit();", class: "button positive" %>
-    <div style="clear:both"></div><br />
-    <%= link_to "Login here!", new_session_path(resource_name) %> or <%= link_to "Register here!", new_registration_path(resource_name) %>
-  </div>
-<% end %>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.submit "Send me reset password instructions" %></div>
+<% end %>
+
+<%= render "links" %>

data/app/views/contour/registrations/edit.html.erb

@@ -1,25 +1,25 @@
 <h2>Edit <%= resource_name.to_s.humanize %></h2>
 
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>
 
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
 
-  <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-  <%= f.password_field :password %></p>
+  <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+  <%= f.password_field :password, :autocomplete => "off" %></div>
 
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>
 
-  <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-  <%= f.password_field :current_password %></p>
+  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <%= f.password_field :current_password %></div>
 
-  <p><%= f.submit "Update" %></p>
+  <div><%= f.submit "Update" %></div>
 <% end %>
 
 <h3>Cancel my account</h3>
 
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), confirm: "Are you sure?", method: :delete %>.</p>
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
 
 <%= link_to "Back", :back %>

data/app/views/contour/registrations/new.html.erb

@@ -1,45 +1,18 @@
-<% @title = 'Register' %>
+<h2>Sign up</h2>
 
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
-  <fieldset style="width:235px">
-    <legend><%= @title %></legend>
 
-    <% if resource.methods.include?(:first_name) %>
-      <div class="field">
-        <%= f.label :first_name %><br />
-        <%= f.text_field :first_name  %>
-      </div>
-    <% end %>
+  <div><%= f.label :email %>
+  <%= f.email_field :email %></div>
 
-    <% if resource.methods.include?(:last_name) %>
-      <div class="field">
-        <%= f.label :last_name %><br />
-        <%= f.text_field :last_name  %>
-      </div>
-    <% end %>
+  <div><%= f.label :password %>
+  <%= f.password_field :password %></div>
 
-    <div class="field">
-      <%= f.label :email %><br />
-      <%= f.text_field :email %>
-    </div>
+  <div><%= f.label :password_confirmation %>
+  <%= f.password_field :password_confirmation %></div>
 
-    <% if resource.password_required? %>
-      <div class="field">
-        <%= f.label :password %><br />
-        <%= f.password_field :password %>
-      </div>
+  <div><%= f.submit "Sign up", class: 'btn btn-primary' %></div>
+<% end %>
 
-      <div class="field">
-        <%= f.label :password_confirmation %><br />
-        <%= f.password_field :password_confirmation %>
-      </div>
-    <% end %>
-  </fieldset>
-  <div class="actions">
-    <% form_name = "new_#{resource.class.name.underscore}" %>
-    <%= link_to_function image_tag('contour/tick.png', alt: '') + "Sign up", "$('##{form_name}').submit();", class: "button positive" %>
-    <div style="clear:both"></div><br />
-    <%= link_to "Already signed up? Login here!", new_session_path(resource_name) %>
-  </div>
-<% end %>
+<%= render "links" %>

data/app/views/contour/sessions/new.html.erb

@@ -1,36 +1,17 @@
-<% @title = 'Login' %>
+<h2>Sign in</h2>
 
-<table class="blank padded">
-  <tr>
-    <td style="vertical-align:top">
-      <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-        <fieldset style="width:235px">
-          <legend><%= @title %></legend>
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+  <div><%= f.label :email %>
+  <%= f.email_field :email %></div>
 
-          <div class="field">
-            <%= f.label :email %><br />
-            <%= f.text_field :email %>
-          </div>
-          <div class="field">
-            <%= f.label :password %><br />
-            <%= f.password_field :password %>
-          </div>
-        </fieldset>
-        <div class="actions">
-          <% form_name = "new_#{resource.class.name.underscore}" %>
-          <%= link_to_function image_tag('contour/tick.png', alt: '') + "Login", "$('##{form_name}').submit();", class: "button positive" %>
-          <% if devise_mapping.rememberable? -%>
-            <div style="padding-top:5px;padding-bottom:4px;"><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
-          <% end -%>
-          <% if devise_mapping.recoverable? && controller_name != 'passwords' %>
-            <div style="clear:both"></div><br />
-            <%= link_to "Forgot your password?", new_password_path(resource_name) %> or <%= link_to "Register here!", new_registration_path(resource_name) %>
-          <% end %>
-        </div>
-      <% end %>
-    </td>
-    <td style="vertical-align:top">
-      <%= render partial: 'contour/layouts/latest_news' %>
-    </td>
-  </tr>
-</table>
+  <div><%= f.label :password %>
+  <%= f.password_field :password %></div>
+
+  <% if devise_mapping.rememberable? -%>
+    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+  <% end -%>
+
+  <div><%= f.submit "Sign in", class: 'btn btn-primary' %></div>
+<% end %>
+
+<%= render "links" %>