imagine_cms 3.0.0.beta3 → 3.0.0.beta4
Sign up to get free protection for your applications and to get access to all the features.
data/README.rdoc
CHANGED
@@ -21,10 +21,10 @@ be a good time to get on board.
|
|
21
21
|
|
22
22
|
=Roadmap
|
23
23
|
|
24
|
-
Here's what's coming up:
|
25
|
-
|
26
24
|
Current status: Original functionality 25% restored
|
27
25
|
|
26
|
+
Here's what's coming up:
|
27
|
+
|
28
28
|
* Imagine 3.0 (Rails 3.2): 90% restored functionality, can function on existing sites with no database changes
|
29
29
|
* Imagine 3.1 (Rails 3.2): 100% restored functionality, may require a few simple migrations
|
30
30
|
* Imagine 4.0 (Rails 4.0): Refactoring & rewriting of the worst parts (substitutions); move away from ERB templating, to something like Liquid; switch to a cross-browser editor; switch to jQuery
|
@@ -1,7 +1,6 @@
|
|
1
1
|
module Cms # :nodoc:
|
2
2
|
class ContentController < ::ApplicationController # :nodoc:
|
3
3
|
caches_action :rss_feed
|
4
|
-
helper CmsApplicationHelper
|
5
4
|
|
6
5
|
before_filter :convert_content_path
|
7
6
|
|
@@ -58,31 +57,5 @@ module Cms # :nodoc:
|
|
58
57
|
false
|
59
58
|
end
|
60
59
|
|
61
|
-
### COMPAT: convert_content_path
|
62
|
-
def convert_content_path
|
63
|
-
logger.debug "DEPRECATION WARNING: convert_content_path called"
|
64
|
-
params[:content_path] = params[:content_path].to_s.split('/')
|
65
|
-
end
|
66
|
-
|
67
|
-
### COMPAT - template_exists?
|
68
|
-
def template_exists?(template, extension = nil)
|
69
|
-
# ignore extension
|
70
|
-
logger.debug("DEPRECATION WARNING: template_exists? called")
|
71
|
-
lookup_context.find_all(template).any?
|
72
|
-
end
|
73
|
-
helper_method :template_exists?
|
74
|
-
|
75
|
-
def url_for_current
|
76
|
-
request.fullpath
|
77
|
-
end
|
78
|
-
helper_method :url_for_current
|
79
|
-
|
80
|
-
### COMPAT - log_error
|
81
|
-
def log_error(e)
|
82
|
-
# noop
|
83
|
-
logger.debug("DEPRECATION WARNING: log_error called")
|
84
|
-
logger.error(e)
|
85
|
-
end
|
86
|
-
|
87
60
|
end
|
88
61
|
end
|
@@ -75,14 +75,13 @@ module CmsApplicationHelper
|
|
75
75
|
# Display any available flash messages (:error, :notice),
|
76
76
|
#
|
77
77
|
# NOTE: @error and @notice are deprecated, use flash.now[:error] and flash.now[:notice] instead.
|
78
|
-
def flash_message
|
78
|
+
def flash_message
|
79
79
|
output = ''.html_safe
|
80
80
|
if (flash[:error] || @error || '') != ''
|
81
|
-
output << content_tag('
|
82
|
-
output << content_tag('p', :class => 'error') { flash[:error] || @error }
|
81
|
+
output << content_tag('div', :class => 'alert alert-error') { flash[:error] || @error }
|
83
82
|
end
|
84
83
|
if (flash[:notice] || @notice || '') != ''
|
85
|
-
output << content_tag('
|
84
|
+
output << content_tag('div', :class => 'alert alert-info') { flash[:notice] || @notice }
|
86
85
|
end
|
87
86
|
output
|
88
87
|
end
|
@@ -3,6 +3,7 @@ module ActionControllerExtensions
|
|
3
3
|
end
|
4
4
|
|
5
5
|
module InstanceMethods
|
6
|
+
|
6
7
|
# Determines whether the input string is a valid email address per RFC specification
|
7
8
|
def valid_email_address?(addr, perform_mx_lookup = false)
|
8
9
|
valid = true
|
@@ -24,5 +25,32 @@ module ActionControllerExtensions
|
|
24
25
|
|
25
26
|
valid
|
26
27
|
end
|
28
|
+
|
29
|
+
### COMPAT: convert_content_path
|
30
|
+
def convert_content_path
|
31
|
+
logger.debug "DEPRECATION WARNING: convert_content_path called"
|
32
|
+
params[:content_path] = params[:content_path].to_s.split('/')
|
33
|
+
end
|
34
|
+
|
35
|
+
### COMPAT - template_exists?
|
36
|
+
def template_exists?(template, extension = nil)
|
37
|
+
# ignore extension
|
38
|
+
logger.debug("DEPRECATION WARNING: template_exists? called")
|
39
|
+
lookup_context.find_all(template).any?
|
40
|
+
end
|
41
|
+
|
42
|
+
### COMPAT - template_exists?
|
43
|
+
def url_for_current
|
44
|
+
logger.debug("DEPRECATION WARNING: url_for_current called")
|
45
|
+
request.fullpath
|
46
|
+
end
|
47
|
+
|
48
|
+
### COMPAT - log_error
|
49
|
+
def log_error(e)
|
50
|
+
# noop
|
51
|
+
logger.debug("DEPRECATION WARNING: log_error called")
|
52
|
+
logger.error(e)
|
53
|
+
end
|
54
|
+
|
27
55
|
end
|
28
56
|
end
|
data/lib/imagine_cms/engine.rb
CHANGED
@@ -26,6 +26,11 @@ module ImagineCms
|
|
26
26
|
require 'extensions/action_controller'
|
27
27
|
extend ActionControllerExtensions::ClassMethods
|
28
28
|
include ActionControllerExtensions::InstanceMethods
|
29
|
+
|
30
|
+
helper CmsApplicationHelper
|
31
|
+
helper_method :template_exists?
|
32
|
+
helper_method :url_for_current
|
33
|
+
|
29
34
|
# before_filter :create_settings_object, :set_default_session_values, :check_ssl_requirement, :expire_session_data
|
30
35
|
# after_filter :compress_output
|
31
36
|
end
|
data/lib/imagine_cms/version.rb
CHANGED
metadata
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: imagine_cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 62196427
|
5
5
|
prerelease: 6
|
6
6
|
segments:
|
7
7
|
- 3
|
8
8
|
- 0
|
9
9
|
- 0
|
10
10
|
- beta
|
11
|
-
-
|
12
|
-
version: 3.0.0.
|
11
|
+
- 4
|
12
|
+
version: 3.0.0.beta4
|
13
13
|
platform: ruby
|
14
14
|
authors:
|
15
15
|
- Aaron Namba
|
@@ -17,7 +17,7 @@ autorequire:
|
|
17
17
|
bindir: bin
|
18
18
|
cert_chain: []
|
19
19
|
|
20
|
-
date: 2012-04-
|
20
|
+
date: 2012-04-29 00:00:00 Z
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|
23
23
|
name: rails
|