contour 0.9.4 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. data/CHANGELOG.rdoc +5 -0
  2. data/README.rdoc +1 -1
  3. data/app/assets/javascripts/contour/menu.js.coffee +4 -4
  4. data/app/views/contour/layouts/application.html.erb +7 -8
  5. data/lib/contour.rb +7 -7
  6. data/lib/contour/version.rb +2 -2
  7. metadata +23 -23
data/CHANGELOG.rdoc CHANGED
@@ -1,3 +1,8 @@
1
+ == 0.10.0
2
+
3
+ * Enhancements
4
+ * Changes made to accomodate contour template gems like contour-minimalist
5
+
1
6
  == 0.9.4
2
7
 
3
8
  * Enhancements
data/README.rdoc CHANGED
@@ -46,7 +46,7 @@ Make sure you have Rails 3.2.1
46
46
 
47
47
  Modify Gemfile and add
48
48
 
49
- gem 'contour', '~> 0.9.0' # Basic Layout and Assets
49
+ gem 'contour', '~> 0.10.0' # Basic Layout and Assets
50
50
 
51
51
  Run Bundle install
52
52
 
data/app/assets/javascripts/contour/menu.js.coffee CHANGED
@@ -4,18 +4,18 @@ jQuery ->
4
4
  $(this).css( left: $("#header").offset().left )
5
5
  event.stopPropagation()
6
6
  )
7
-
7
+
8
8
  $('#menu').find("li").each( () ->
9
9
  if $(this).find("ul").length > 0
10
10
  # $("<span>").text("^").appendTo($(this).children(":first"))
11
-
11
+
12
12
  # show subnav on hover
13
13
  $(this).mouseenter( () ->
14
14
  $(this).find("ul").stop(true, true).show() #slideDown()
15
15
  )
16
-
16
+
17
17
  # hide submenus on exit
18
18
  $(this).mouseleave( () ->
19
19
  $(this).find("ul").stop(true, true).hide() #slideUp()
20
20
  )
21
- )
21
+ )
data/app/views/contour/layouts/application.html.erb CHANGED
@@ -8,14 +8,11 @@
8
8
  <%= csrf_meta_tags %>
9
9
  </head>
10
10
  <body>
11
- <%#= javascript_tag "var root_url='#{Contour.application_site_url + '/'}';var auth_token='#{form_authenticity_token}';" %>
12
11
  <%= javascript_tag "var root_url='#{request.script_name + '/'}';var auth_token='#{form_authenticity_token}';" %>
13
12
  <div id="header" class="container" <%= "style='background-image: url(#{request.script_name}/assets/#{Contour.header_background_image});'" unless Contour.header_background_image.blank? %>>
14
- <div id="version" style="position:relative;display:none">
15
- <span style="position:absolute;top:-15px;left:82px;font-size:0.5em;font-variant:normal" class="quiet"><%= Contour.application_version %></span>
16
- </div>
17
13
  <%= image_tag(Contour.header_title_image, alt: '', style: 'vertical-align:middle') unless Contour.header_title_image.blank? %>
18
- <%= link_to (Contour.application_name_html.blank? ? Contour.application_name : Contour.application_name_html.html_safe), root_path, style: 'text-decoration:none;color:#404040;', onmouseover: "$('#version').show();", onmouseout: "$('#version').hide();" %>
14
+ <%= 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();" %>
15
+ <span id="version" style="display:none;font-size:0.5em;font-variant:normal" class="quiet"><%= Contour.application_version %></span>
19
16
  </div>
20
17
 
21
18
  <div class="container" style="position:relative">
@@ -24,8 +21,10 @@
24
21
  </div>
25
22
  </div>
26
23
 
27
- <div id="menu" class="container shadow">
28
- <%= render partial: 'contour/layouts/menu' %>
24
+ <div style="height:29px">
25
+ <div id="menu" class="container shadow">
26
+ <%= render partial: 'contour/layouts/menu' %>
27
+ </div>
29
28
  </div>
30
29
 
31
30
  <div id="content" class="container">
@@ -43,4 +42,4 @@
43
42
 
44
43
  <div id="background_popup"></div>
45
44
  </body>
46
- </html>
45
+ </html>
data/lib/contour.rb CHANGED
@@ -6,7 +6,7 @@ module Contour
6
6
  # Default Application Name
7
7
  mattr_accessor :application_name
8
8
  @@application_name = 'Application Name'
9
-
9
+
10
10
  mattr_accessor :application_name_html
11
11
  @@application_name_html = nil
12
12
 
@@ -18,14 +18,14 @@ module Contour
18
18
  # mattr_accessor :application_site_url
19
19
  # @@application_site_url = 'http://localhost'
20
20
 
21
- # Default Application Version
21
+ # Default Header Background Image (Logo)
22
22
  mattr_accessor :header_background_image
23
23
  @@header_background_image = 'rails.png'
24
-
24
+
25
25
  # Default Application Version
26
26
  mattr_accessor :header_title_image
27
27
  @@header_title_image = nil
28
-
28
+
29
29
  # Default Menu Items
30
30
  mattr_accessor :menu_items
31
31
  @@menu_items = [
@@ -45,15 +45,15 @@ module Contour
45
45
  links: []
46
46
  }
47
47
  ]
48
-
48
+
49
49
  # Default news feed
50
50
  mattr_accessor :news_feed
51
51
  @@news_feed = nil
52
-
52
+
53
53
  # Default max number of items displayed in the news feed
54
54
  mattr_accessor :news_feed_items
55
55
  @@news_feed_items = 5
56
-
56
+
57
57
  def self.setup
58
58
  yield self
59
59
  end
data/lib/contour/version.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  module Contour
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
- MINOR = 9
5
- TINY = 4
4
+ MINOR = 10
5
+ TINY = 0
6
6
  BUILD = nil # nil, "pre", "rc", "rc2"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: contour
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.4
4
+ version: 0.10.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-02-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70266697995800 !ruby/object:Gem::Requirement
16
+ requirement: &70345337081040 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70266697995800
24
+ version_requirements: *70345337081040
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: jquery-rails
27
- requirement: &70266697994460 !ruby/object:Gem::Requirement
27
+ requirement: &70345337096000 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 2.0.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70266697994460
35
+ version_requirements: *70345337096000
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise
38
- requirement: &70266697992760 !ruby/object:Gem::Requirement
38
+ requirement: &70345337095120 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 2.0.1
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70266697992760
46
+ version_requirements: *70345337095120
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: omniauth
49
- requirement: &70266697990360 !ruby/object:Gem::Requirement
49
+ requirement: &70345337094600 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.0.2
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70266697990360
57
+ version_requirements: *70345337094600
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: omniauth-openid
60
- requirement: &70266698011700 !ruby/object:Gem::Requirement
60
+ requirement: &70345337093940 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.0.1
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70266698011700
68
+ version_requirements: *70345337093940
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: omniauth-ldap
71
- requirement: &70266698010000 !ruby/object:Gem::Requirement
71
+ requirement: &70345337092600 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 1.0.2
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70266698010000
79
+ version_requirements: *70345337092600
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: omniauth-twitter
82
- requirement: &70266698008900 !ruby/object:Gem::Requirement
82
+ requirement: &70345337092000 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 0.0.8
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70266698008900
90
+ version_requirements: *70345337092000
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: omniauth-facebook
93
- requirement: &70266698007560 !ruby/object:Gem::Requirement
93
+ requirement: &70345337091180 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 1.2.0
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70266698007560
101
+ version_requirements: *70345337091180
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: omniauth-linkedin
104
- requirement: &70266698006800 !ruby/object:Gem::Requirement
104
+ requirement: &70345337090540 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 0.0.6
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70266698006800
112
+ version_requirements: *70345337090540
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: omniauth-cas
115
- requirement: &70266698005400 !ruby/object:Gem::Requirement
115
+ requirement: &70345337089820 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 0.0.5
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70266698005400
123
+ version_requirements: *70345337089820
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: sqlite3
126
- requirement: &70266698019040 !ruby/object:Gem::Requirement
126
+ requirement: &70345337088760 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70266698019040
134
+ version_requirements: *70345337088760
135
135
  description: Basic Rails Framework files and assets for layout and authentication
136
136
  email: remosm@gmail.com
137
137
  executables: []