contour 0.6.1 → 0.7.0

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+== 0.7.0
+
+* Enhancements
+  * Restructuring gem to be more in line with a gem created by 'rails plugin new'
+  * Menu system updated to use embedded ul and li tags, and jQuery to capture mouseenter and mouseleave
+  * GUI updates for alert and notice popups
+
+* Testing
+  * Adding dummy app and tests
+
+* Bug Fix
+  * New Menu system is now IE7+ compatible
+
 == 0.6.1
 
 * Bug Fix

data/README.rdoc

@@ -32,12 +32,6 @@ Contour provides custom JavaScript.  In order to make the application layout fun
 
 In order to get registration working, you can use the modified Contour Authentications controller which overrides the default devise controller of the same name:
 
-  match '/auth/failure' => 'contour/authentications#failure'
-  match '/auth/:provider/callback' => 'contour/authentications#create'
-  match '/auth/:provider' => 'contour/authentications#passthru'
-
-  resources :authentications, :controller => 'contour/authentications'
-
   devise_for :users, :controllers => {:registrations => 'contour/registrations', :sessions => 'contour/sessions', :passwords => 'contour/passwords'}, :path_names => { :sign_up => 'register', :sign_in => 'login' }
 
 == Setting up a new project with quick authentication
@@ -52,7 +46,7 @@ Make sure you have Rails 3.1.1
   
 Modify Gemfile and add
 
-  gem 'contour', '~> 0.6.0'          # Basic Layout and Assets
+  gem 'contour', '~> 0.7.0'          # Basic Layout and Assets
   gem 'devise'                       # User Authorization
   gem 'omniauth'                     # User Multi-Authentication  
 

data/Rakefile

@@ -0,0 +1,38 @@
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Contour'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('CHANGELOG.rdoc')
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task :default => :test

data/app/assets/javascripts/contour/global.js.coffee

@@ -0,0 +1,13 @@
+# Global functions referenced from HTML
+@showWaiting = (element_id, text, centered) ->
+  element = $(element_id)
+  if element && centered
+    element.html('<br /><center><img width=\"13\" height=\"13\" src=\"' + root_url + 'assets/ajax-loader.gif\" align=\"absmiddle\" alt=\"...\" />' + text + '</center><br />')
+  else if element
+    element.html('<img width=\"13\" height=\"13\" src=\"' + root_url + 'assets/ajax-loader.gif\" align=\"absmiddle\" alt=\"...\" />' + text)
+
+@showMessage = (elements) ->
+  $.each(elements, (index, value) ->
+    element = $(value)
+    element.fadeIn(2000)
+  )

data/app/assets/javascripts/contour/menu.js.coffee

@@ -0,0 +1,21 @@
+jQuery ->
+  $('#menu').waypoint( (event, direction) ->
+    $(this).toggleClass('sticky', direction == "down")
+    $(this).css( left: $("#header").offset().left )
+    event.stopPropagation()
+  )
+  
+  $('#menu').find("li").each( () ->
+    if $(this).find("ul").length > 0
+      # $("<span>").text("^").appendTo($(this).children(":first"))
+      
+      # show subnav on hover
+      $(this).mouseenter( () ->
+        $(this).find("ul").stop(true, true).show() #slideDown()
+      )
+      
+      # hide submenus on exit
+      $(this).mouseleave( () ->
+        $(this).find("ul").stop(true, true).hide() #slideUp()
+      )
+  )

data/{vendor → app}/assets/stylesheets/contour/global.css

@@ -17,7 +17,8 @@ a:link.positive {
 }
 
 #content {
-  padding: 4px;
+  margin-top: 10px;
+  padding: 0px 4px 4px 4px;
   background-color: #FFF;
 }
 

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

@@ -0,0 +1,109 @@
+/**************************************/
+/*             NAVIGATION             */
+/**************************************/
+
+#menu ul.ul-menu {
+  margin: 0px;
+  list-style: none;
+  position: relative;
+  z-index: 1;
+}
+
+#menu ul.ul-menu li {
+  margin-left: 0px;
+  display: block;
+/*  float: left;*/
+  position: relative;
+  padding: 0px 5px;
+}
+
+#menu ul.ul-menu li.li_left {
+/*  display: block;*/
+  float: left;
+  z-index: 1;
+/*  position: relative;*/
+}
+
+#menu ul.ul-menu li.li_right {
+/*  display: block;*/
+  float: right;
+  z-index: 1;
+/*  position: relative;*/
+}
+
+#menu ul.ul-menu li ul {
+  list-style: none;
+/*  position: relative;*/
+  top: 16px;
+  
+  padding: 8px 5px 5px 5px;
+  margin: 0px -5px;
+  
+  border-bottom-right-radius: 8px;
+  -moz-border-radius-bottomright: 8px;
+  -webkit-border-radius-bottomright: 8px;
+  
+  border-bottom-left-radius: 8px;
+  -moz-border-radius-bottomleft: 8px;
+  -webkit-border-radius-bottomleft: 8px;
+  
+  -moz-box-shadow: 0px 5px 5px #666;
+  -webkit-box-shadow: 0px 5px 5px #666;
+  box-shadow: 0px 5px 5px #666;
+
+  background-color: #404040;
+  position: absolute;
+  display: none;
+}
+
+#menu ul.ul-menu li.li_left ul {
+  left: 0px;
+}
+
+#menu ul.ul-menu li.li_right ul {
+  right: 0px;
+  text-align: right;
+}
+
+
+#menu ul.ul-menu li ul li {
+  white-space: nowrap;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+#menu {
+	background:#404040;
+  padding:5px;
+	color: #fff;
+	
+  -moz-border-radius-bottomright: 8px;
+  -webkit-border-radius-bottomright: 8px;
+	border-bottom-right-radius: 8px;
+  
+  -moz-border-radius-bottomleft: 8px;
+  -webkit-border-radius-bottomleft: 8px;
+  border-bottom-left-radius: 8px;
+  
+	-moz-box-shadow: 0px 5px 5px #666;
+  -webkit-box-shadow: 0px 5px 5px #666;
+  box-shadow: 0px 5px 5px #666;  
+}
+
+.sticky {
+  position:fixed;
+  top:0;
+  width:950px;
+  margin:0 auto;
+  z-index:100;
+}
+
+#menu a {
+  color: #fff;
+  text-decoration: none;
+  padding:0 5px;
+}
+
+#menu a:hover {
+  color: #EB6C20;
+}

data/{vendor → app}/assets/stylesheets/contour/message.css

@@ -3,12 +3,20 @@
 /**************************************/
 
 #message {
-  position:absolute;
-  left:-5px;
-  top:-30px;  
+  position: absolute;
+  left: -5px;
+  top: -28px;
+}
+
+.error {
+  background: #FBC2C4;
+}
+.notice {
+  background: #FFF493;
 }
 
 .notice, .error {
+  border-width: 0px;
   float:left;
   margin:0 4px 0 0;
   padding:2px 8px;
@@ -24,4 +32,8 @@
   border-top-right-radius: 8px;
   -moz-border-radius-topright: 8px;
   -webkit-border-radius-topright: 8px;
+  
+  -moz-box-shadow: 0px 0px 5px #666;
+  -webkit-box-shadow: 0px 0px 5px #666;
+  box-shadow: 0px 0px 5px #666;
 }

data/app/models/authentication.rb

@@ -0,0 +1,11 @@
+class Authentication < ActiveRecord::Base
+  belongs_to :user
+  
+  def provider_name
+    if provider == 'open_id'
+      "OpenID"
+    else
+      provider.to_s.titleize
+    end
+  end
+end

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

@@ -1,3 +1,28 @@
+<% PROVIDERS.each do |provider| %>
+  <% url_params = (provider == :google_apps) ? '?domain=gmail.com' : '' %>
+  <% if provider == :open_id %>
+    <% provider_name = 'OpenID' %>
+    <% image_name = 'openid' %>
+  <% elsif provider == :linked_in %>
+    <% provider_name = 'LinkedIn' %>
+    <% image_name = 'linkedin' %>
+  <% elsif [:LDAP, :CAS].include?(provider) %>
+    <% provider_name = provider.to_s.upcase %>
+    <% image_name = provider.to_s.downcase %>
+  <% else %>
+    <% provider_name = provider.to_s.titleize %>
+    <% image_name = provider.to_s.downcase %>
+  <% end %>
+  <li class="parent li_right" style="top:-4px;height:20px;"> <%# margin-right:15px;padding-left:0px;padding-right:0px %>
+    <a href="<%= request.script_name %><%= "/" + OmniAuth.config.path_prefix.split('/').last.to_s %><%= "/" + provider.to_s.downcase %><%= url_params %>" class="noicon">
+      <%= image_tag "contour/#{image_name}_32.png", :align => 'absmiddle', :height => "28px", :title => provider_name %>
+    </a>
+  </li>
+<% end %>
+
+
+
+<% if false %>
 <% PROVIDERS.each do |provider| %>
   <% url_params = (provider == :google_apps) ? '?domain=gmail.com' : '' %>
   <% if provider == :open_id %>
@@ -18,4 +43,5 @@
       <%= image_tag "contour/#{image_name}_32.png", :align => 'absmiddle', :height => "28px", :title => provider_name %>
     </a>
   </div>
+<% end %>
 <% end %>