wontomedia 1.0.1 → 1.0.2
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION.yml +1 -1
- data/app/controllers/admin_controller.rb +2 -1
- data/app/controllers/connections_controller.rb +3 -1
- data/app/controllers/items_controller.rb +4 -9
- data/app/helpers/format_helper.rb +2 -4
- data/app/helpers/items_helper.rb +2 -1
- data/app/models/connection.rb +7 -2
- data/app/views/items/_content_examples.html.erb +1 -1
- data/app/views/items/_form_fields.html.erb +2 -2
- data/app/views/layouts/_dynamic_alert_framework.html.erb +3 -1
- data/config/environments/development.rb +16 -7
- data/config/environments/production.rb +16 -7
- data/config/environments/test.rb +16 -7
- data/default-custom/public/stylesheets/wm.css +0 -1
- metadata +3 -3
data/VERSION.yml
CHANGED
@@ -18,7 +18,8 @@
|
|
18
18
|
#++
|
19
19
|
|
20
20
|
|
21
|
-
|
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
|
-
|
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
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
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?
|
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
|
''
|
data/app/helpers/items_helper.rb
CHANGED
data/app/models/connection.rb
CHANGED
@@ -18,8 +18,10 @@
|
|
18
18
|
#++
|
19
19
|
|
20
20
|
|
21
|
-
|
22
|
-
|
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
|
|
@@ -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(
|
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
|
-
#
|
2
|
-
#
|
3
|
-
#
|
4
|
-
#
|
5
|
-
#
|
6
|
-
#
|
7
|
-
#
|
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
|
-
#
|
2
|
-
#
|
3
|
-
#
|
4
|
-
#
|
5
|
-
#
|
6
|
-
#
|
7
|
-
#
|
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
|
data/config/environments/test.rb
CHANGED
@@ -1,10 +1,19 @@
|
|
1
|
-
#
|
2
|
-
#
|
3
|
-
#
|
4
|
-
#
|
5
|
-
#
|
6
|
-
#
|
7
|
-
#
|
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
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 1
|
7
7
|
- 0
|
8
|
-
-
|
9
|
-
version: 1.0.
|
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-
|
17
|
+
date: 2010-04-11 00:00:00 -07:00
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|