wontomedia 1.0.1 → 1.0.2

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.
data/VERSION.yml CHANGED
@@ -1,4 +1,4 @@
1
1
  ---
2
2
  :major: 1
3
3
  :minor: 0
4
- :patch: 1
4
+ :patch: 2
@@ -18,7 +18,8 @@
18
18
  #++
19
19
 
20
20
 
21
- require Rails.root.join( 'lib', 'helpers', 'item_helper')
21
+ ActiveSupport::Dependencies.require_or_load Rails.root.join(
22
+ 'lib', 'helpers', 'item_helper')
22
23
  require 'yaml'
23
24
 
24
25
  # There is no model matching this controller. It is intended to
@@ -18,7 +18,9 @@
18
18
  #++
19
19
 
20
20
 
21
- require Rails.root.join( 'lib', 'helpers', 'connection_helper')
21
+ ActiveSupport::Dependencies.require_or_load Rails.root.join(
22
+ 'lib', 'helpers', 'connection_helper')
23
+
22
24
 
23
25
  # See also the matching model Connection
24
26
  class ConnectionsController < ApplicationController
@@ -18,15 +18,10 @@
18
18
  #++
19
19
 
20
20
 
21
- #### I've got no idea why this 'require' is necessary. Without it, all
22
- # the unit tests pass, but the ItemHelper.nouns call below fails when
23
- # run in production. Even more odd, if run in 'development' (so that
24
- # each Ruby file is reloaded at each request, this 'require' only has
25
- # to be present for the _first_ request serviced after the server
26
- # starts. It can be deleted, this file reloaded, and then ItemHelper
27
- # references will work normally. Go figure. -- gei 2010/2/24
28
- require Rails.root.join( 'lib', 'helpers', 'item_helper')
29
- require Rails.root.join( 'lib', 'helpers', 'connection_helper')
21
+ ActiveSupport::Dependencies.require_or_load Rails.root.join(
22
+ 'lib', 'helpers', 'item_helper')
23
+ ActiveSupport::Dependencies.require_or_load Rails.root.join(
24
+ 'lib', 'helpers', 'connection_helper')
30
25
  require 'yaml'
31
26
 
32
27
  # See also the matching model Item
@@ -172,11 +172,9 @@ module FormatHelper
172
172
  end
173
173
 
174
174
 
175
- ALERT_CONTENT_NAME = 'dynamic_alert_content'
176
- ALERT_CONTENT_PATH = Rails.root.join(
177
- 'app', 'views', 'layouts', '_' + ALERT_CONTENT_NAME + '.html' )
178
175
  def allpages_alert
179
- if File.exists? ALERT_CONTENT_PATH
176
+ if File.exists? Rails.root.join(
177
+ 'app', 'views', 'layouts', '_dynamic_alert_content.html' )
180
178
  render :partial => File.join( 'layouts', 'dynamic_alert_framework' )
181
179
  else
182
180
  ''
@@ -18,7 +18,8 @@
18
18
  #++
19
19
 
20
20
 
21
- require Rails.root.join( 'app', 'helpers', 'format_helper' )
21
+ ActiveSupport::Dependencies.require_or_load Rails.root.join(
22
+ 'app', 'helpers', 'format_helper' )
22
23
  include(FormatHelper)
23
24
 
24
25
  # Helpers for app/views/items/* pages
@@ -18,8 +18,10 @@
18
18
  #++
19
19
 
20
20
 
21
- require Rails.root.join( 'lib', 'helpers', 'item_helper')
22
- require Rails.root.join( 'lib', 'helpers', 'tripple_navigation')
21
+ ActiveSupport::Dependencies.require_or_load Rails.root.join(
22
+ 'lib', 'helpers', 'item_helper')
23
+ ActiveSupport::Dependencies.require_or_load Rails.root.join(
24
+ 'lib', 'helpers', 'tripple_navigation')
23
25
 
24
26
  # Model for the representation of "connections" (which are used to
25
27
  # make statements about the relationships between "item") in
@@ -223,6 +225,9 @@ private
223
225
  if field.nil?
224
226
  errors.add symbol, "can't be blank."
225
227
  return false
228
+ elsif field =~ /^\s*$/
229
+ errors.add symbol, "can't be blank."
230
+ return false
226
231
  end
227
232
  end
228
233
 
@@ -23,7 +23,7 @@
23
23
  displaying the complete set of non-Property items.]</p>
24
24
  <% end %>
25
25
 
26
- <h2 class="subheading">Recently Added</h2>
26
+ <h2 class="subheading">Recently Updated</h2>
27
27
  <style>
28
28
  .item-title {
29
29
  font-size: 120%;
@@ -25,7 +25,7 @@
25
25
  <%= image_tag "blank_error_icon.png", :id=>"title_error_icon", :alt=>"",
26
26
  :size=>"16x16" -%>
27
27
  <span style="position: absolute; left: 10em; top: 0.3ex; height: 1ex; white-space: nowrap;">
28
- <i>for example:</i>"<%= h @example.title -%>"
28
+ <i>for example:</i> "<%= h @example.title -%>"
29
29
  </span>
30
30
  <br />
31
31
  <%= f.text_field :title, :tabindex => "120", :style => "width: 75%;" %>
@@ -46,7 +46,7 @@
46
46
  <%= image_tag "blank_status_icon.png", :id=>"name_status_icon", :alt=>"",
47
47
  :size=>"32x16" %>
48
48
  <span style="position: absolute; left: 10em; top: 0.3ex;">
49
- <i>for example:</i>"<%= h @example.name -%>"
49
+ <i>for example:</i> "<%= h @example.name -%>"
50
50
  </span>
51
51
  <br />
52
52
  <%= f.text_field :name, :tabindex => "130", :style => "width: 55%;" %>
@@ -48,7 +48,9 @@
48
48
  <div id="alert_box_close_link">
49
49
  <%= link_to_function "X", "dynamic_alert_show_link();" %>
50
50
  </div>
51
- <%= open(FormatHelper::ALERT_CONTENT_PATH).read %>
51
+ <%= open( Rails.root.join(
52
+ 'app', 'views', 'layouts', '_dynamic_alert_content.html' )
53
+ ).read %>
52
54
  </div>
53
55
 
54
56
  <script>
@@ -1,10 +1,19 @@
1
- # !!!!! This file was auto-generated by "ruby rails wontomedia" IF
2
- # !!!!! YOU MODIFY IT, you *MUST* replace this notice with a WontoMedia
3
- # !!!!! copyright attribute (get from policy/copyright-notices/header.rb)
4
- # !!!!! *AND* remove the name of this file from the copyright checking
5
- # !!!!! ignore list (policy/copyright-notice-ignore) *BEFORE*
6
- # !!!!! submitting to any version control that feeds back to the
7
- # !!!!! WontoMedia project.
1
+ # WontoMedia - a wontology web application
2
+ # Copyright (C) 2010 - Glen E. Ivey
3
+ # www.wontology.com
4
+ #
5
+ # This program is free software: you can redistribute it and/or modify
6
+ # it under the terms of the GNU Affero General Public License version
7
+ # 3 as published by the Free Software Foundation.
8
+ #
9
+ # This program is distributed in the hope that it will be useful,
10
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
+ # GNU Affero General Public License for more details.
13
+ #
14
+ # You should have received a copy of the GNU Affero General Public License
15
+ # along with this program in the file COPYING and/or LICENSE. If not,
16
+ # see <http://www.gnu.org/licenses/>.
8
17
 
9
18
 
10
19
  # Settings specified here will take precedence over those in config/environment.rb
@@ -1,10 +1,19 @@
1
- # !!!!! This file was auto-generated by "ruby rails wontomedia" IF
2
- # !!!!! YOU MODIFY IT, you *MUST* replace this notice with a WontoMedia
3
- # !!!!! copyright attribute (get from policy/copyright-notices/header.rb)
4
- # !!!!! *AND* remove the name of this file from the copyright checking
5
- # !!!!! ignore list (policy/copyright-notice-ignore) *BEFORE*
6
- # !!!!! submitting to any version control that feeds back to the
7
- # !!!!! WontoMedia project.
1
+ # WontoMedia - a wontology web application
2
+ # Copyright (C) 2010 - Glen E. Ivey
3
+ # www.wontology.com
4
+ #
5
+ # This program is free software: you can redistribute it and/or modify
6
+ # it under the terms of the GNU Affero General Public License version
7
+ # 3 as published by the Free Software Foundation.
8
+ #
9
+ # This program is distributed in the hope that it will be useful,
10
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
+ # GNU Affero General Public License for more details.
13
+ #
14
+ # You should have received a copy of the GNU Affero General Public License
15
+ # along with this program in the file COPYING and/or LICENSE. If not,
16
+ # see <http://www.gnu.org/licenses/>.
8
17
 
9
18
 
10
19
  # Settings specified here will take precedence over those in config/environment.rb
@@ -1,10 +1,19 @@
1
- # !!!!! This file was auto-generated by "ruby rails wontomedia" IF
2
- # !!!!! YOU MODIFY IT, you *MUST* replace this notice with a WontoMedia
3
- # !!!!! copyright attribute (get from policy/copyright-notices/header.rb)
4
- # !!!!! *AND* remove the name of this file from the copyright checking
5
- # !!!!! ignore list (policy/copyright-notice-ignore) *BEFORE*
6
- # !!!!! submitting to any version control that feeds back to the
7
- # !!!!! WontoMedia project.
1
+ # WontoMedia - a wontology web application
2
+ # Copyright (C) 2010 - Glen E. Ivey
3
+ # www.wontology.com
4
+ #
5
+ # This program is free software: you can redistribute it and/or modify
6
+ # it under the terms of the GNU Affero General Public License version
7
+ # 3 as published by the Free Software Foundation.
8
+ #
9
+ # This program is distributed in the hope that it will be useful,
10
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
+ # GNU Affero General Public License for more details.
13
+ #
14
+ # You should have received a copy of the GNU Affero General Public License
15
+ # along with this program in the file COPYING and/or LICENSE. If not,
16
+ # see <http://www.gnu.org/licenses/>.
8
17
 
9
18
 
10
19
  # Settings specified here will take precedence over those in config/environment.rb
@@ -69,7 +69,6 @@ div#fancybox-outer {
69
69
  top: 0;
70
70
  left: 15.5%;
71
71
  height: 8ex;
72
- width: 84.5%
73
72
  overflow: hidden;
74
73
  }
75
74
  .content {
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 0
8
- - 1
9
- version: 1.0.1
8
+ - 2
9
+ version: 1.0.2
10
10
  platform: ruby
11
11
  authors:
12
12
  - Glen E. Ivey
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-03-28 00:00:00 -07:00
17
+ date: 2010-04-11 00:00:00 -07:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency