lolita 3.1.13 → 3.1.14
Sign up to get free protection for your applications and to get access to all the features.
- data/GUIDELINES.rdoc +0 -2
- data/Gemfile +1 -1
- data/History.rdoc +5 -0
- data/VERSION +1 -1
- data/app/controllers/lolita/rest_controller.rb +2 -2
- data/lib/lolita/controllers/internal_helpers.rb +12 -0
- data/lolita.gemspec +5 -5
- data/public/images/lolita/plus.png +0 -0
- data/public/stylesheets/lolita/default.css +2 -2
- data/public/stylesheets/lolita/style.css +10 -4
- metadata +32 -32
data/GUIDELINES.rdoc
CHANGED
data/Gemfile
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
source "http://rubygems.org"
|
2
2
|
|
3
3
|
# Thing how to seperate gems for Rails Engine from those that are only for lolita
|
4
|
-
gem "rails", "~>3.0.
|
4
|
+
gem "rails", "~>3.0.10"
|
5
5
|
gem "kaminari", "~>0.12.4"
|
6
6
|
gem "abstract"
|
7
7
|
gem "builder", "~> 2.1.2" #cucumber asks for builder 3 but rails supports 2.1
|
data/History.rdoc
CHANGED
@@ -1,3 +1,8 @@
|
|
1
|
+
=== Version 3.1.14 / 2011-08-24
|
2
|
+
* Enhancements
|
3
|
+
* request notifications moved to related methods in ::Controllers::InternalHelpers
|
4
|
+
* Some minor visual improvements (Rolands Bondars)
|
5
|
+
|
1
6
|
=== Version 3.1.13 / 2011-08-16
|
2
7
|
* Enhancements
|
3
8
|
* Color for Lolita-Alert popup changed
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.1.
|
1
|
+
3.1.14
|
@@ -95,13 +95,13 @@ class Lolita::RestController < ApplicationController
|
|
95
95
|
|
96
96
|
def respond_html_200
|
97
97
|
response.headers["Validation"] = 'true'
|
98
|
-
|
98
|
+
notice(::I18n.t "lolita.shared.save_notice")
|
99
99
|
show_form
|
100
100
|
end
|
101
101
|
|
102
102
|
def respond_html_400
|
103
103
|
response.headers["Validation"] = 'false'
|
104
|
-
|
104
|
+
alert(::I18n.t "lolita.shared.save_alert")
|
105
105
|
show_form
|
106
106
|
end
|
107
107
|
|
@@ -42,6 +42,18 @@ module Lolita
|
|
42
42
|
|
43
43
|
protected
|
44
44
|
|
45
|
+
def notice(msg)
|
46
|
+
response.headers["Lolita-Notice"] = Base64.encode64(msg)
|
47
|
+
end
|
48
|
+
|
49
|
+
def alert(msg)
|
50
|
+
response.headers["Lolita-Alert"] = Base64.encode64(msg)
|
51
|
+
end
|
52
|
+
|
53
|
+
def error(msg)
|
54
|
+
response.headers["Lolita-Error"] = Base64.encode64(msg)
|
55
|
+
end
|
56
|
+
|
45
57
|
def is_lolita_resource?
|
46
58
|
raise ActionController::UnknownAction unless lolita_mapping
|
47
59
|
end
|
data/lolita.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{lolita}
|
8
|
-
s.version = "3.1.
|
8
|
+
s.version = "3.1.14"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = [%q{ITHouse (Latvia) and Arturs Meisters}]
|
12
|
-
s.date = %q{2011-08-
|
12
|
+
s.date = %q{2011-08-24}
|
13
13
|
s.description = %q{Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. }
|
14
14
|
s.email = %q{support@ithouse.lv}
|
15
15
|
s.extra_rdoc_files = [
|
@@ -391,7 +391,7 @@ Gem::Specification.new do |s|
|
|
391
391
|
s.specification_version = 3
|
392
392
|
|
393
393
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
394
|
-
s.add_runtime_dependency(%q<rails>, ["~> 3.0.
|
394
|
+
s.add_runtime_dependency(%q<rails>, ["~> 3.0.10"])
|
395
395
|
s.add_runtime_dependency(%q<kaminari>, ["~> 0.12.4"])
|
396
396
|
s.add_runtime_dependency(%q<abstract>, [">= 0"])
|
397
397
|
s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
|
@@ -406,7 +406,7 @@ Gem::Specification.new do |s|
|
|
406
406
|
s.add_development_dependency(%q<database_cleaner>, [">= 0"])
|
407
407
|
s.add_development_dependency(%q<akephalos>, [">= 0"])
|
408
408
|
else
|
409
|
-
s.add_dependency(%q<rails>, ["~> 3.0.
|
409
|
+
s.add_dependency(%q<rails>, ["~> 3.0.10"])
|
410
410
|
s.add_dependency(%q<kaminari>, ["~> 0.12.4"])
|
411
411
|
s.add_dependency(%q<abstract>, [">= 0"])
|
412
412
|
s.add_dependency(%q<builder>, ["~> 2.1.2"])
|
@@ -422,7 +422,7 @@ Gem::Specification.new do |s|
|
|
422
422
|
s.add_dependency(%q<akephalos>, [">= 0"])
|
423
423
|
end
|
424
424
|
else
|
425
|
-
s.add_dependency(%q<rails>, ["~> 3.0.
|
425
|
+
s.add_dependency(%q<rails>, ["~> 3.0.10"])
|
426
426
|
s.add_dependency(%q<kaminari>, ["~> 0.12.4"])
|
427
427
|
s.add_dependency(%q<abstract>, [">= 0"])
|
428
428
|
s.add_dependency(%q<builder>, ["~> 2.1.2"])
|
Binary file
|
@@ -86,8 +86,8 @@ input:invalid, textarea:invalid {
|
|
86
86
|
.no-boxshadow input:invalid, .no-boxshadow textarea:invalid { background-color: #f0dddd; }
|
87
87
|
|
88
88
|
|
89
|
-
::-moz-selection{ background: #
|
90
|
-
::selection { background:#
|
89
|
+
::-moz-selection{ background: #AE91EB; color:#fff; text-shadow: none; }
|
90
|
+
::selection { background:#AE91EB; color:#fff; text-shadow: none; }
|
91
91
|
|
92
92
|
a:link { -webkit-tap-highlight-color: #FF5E99; }
|
93
93
|
|
@@ -140,10 +140,11 @@ footer {height: 50px;} /* for not leaving empty space in bottom */
|
|
140
140
|
-moz-border-radius: 5px;
|
141
141
|
-webkit-border-radius: 5px;
|
142
142
|
border-radius: 5px;
|
143
|
+
margin-bottom: 10px;
|
143
144
|
}
|
144
145
|
|
145
|
-
.boxtitle {position: relative;}
|
146
|
-
.boxtitle h1 {padding: 35px 25px 15px; line-height: 1;} /* h1 contains bgcolor, color and text position because arrow needs different bg and it follows after */
|
146
|
+
.boxtitle {position: relative; z-index: 2}
|
147
|
+
.boxtitle h1 {padding: 35px 25px 15px; line-height: 1; cursor: pointer;} /* h1 contains bgcolor, color and text position because arrow needs different bg and it follows after */
|
147
148
|
.boxtitle .arrow {
|
148
149
|
position: absolute;
|
149
150
|
left: 50%;
|
@@ -174,16 +175,18 @@ footer {height: 50px;} /* for not leaving empty space in bottom */
|
|
174
175
|
.tools > div > * {margin-right: 10px;}
|
175
176
|
|
176
177
|
a.create {
|
178
|
+
position: relative;
|
177
179
|
display: block;
|
180
|
+
z-index: 1;
|
178
181
|
background: #9d81f8;
|
179
182
|
background: -moz-linear-gradient(top, #ae91eb, #9d81f8);
|
180
183
|
background: -webkit-linear-gradient(top, #ae91eb, #9d81f8);
|
181
184
|
padding-right: 30px;
|
182
|
-
line-height:
|
185
|
+
line-height: 37px;
|
183
186
|
text-align: right;
|
184
187
|
color: #efefef;
|
185
188
|
}
|
186
|
-
.create img {position: absolute; right: -
|
189
|
+
.create img {position: absolute; right: -18px;}
|
187
190
|
|
188
191
|
.list {overflow-x: auto;} /* additional html element that encloses table for horizontal overflow scrollbar if too wide */
|
189
192
|
.list table {width: 100%;}
|
@@ -203,6 +206,9 @@ a.create {
|
|
203
206
|
-webkit-box-shadow: inset 0px 1px 1px #ddd;
|
204
207
|
box-shadow: inset 0px 1px 1px #ddd;
|
205
208
|
}
|
209
|
+
.list table tbody tr .tool-cell {width: 5%;}
|
210
|
+
.list table tbody tr .tool-cell a {visibility: hidden; margin-right: 5px;}
|
211
|
+
.list table tbody tr:hover .tool-cell a {visibility: visible;}
|
206
212
|
|
207
213
|
/* filter */
|
208
214
|
#main form.filter {
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lolita
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.1.
|
4
|
+
version: 3.1.14
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,22 +9,22 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-08-
|
12
|
+
date: 2011-08-24 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
16
|
-
requirement: &
|
16
|
+
requirement: &76358470 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 3.0.
|
21
|
+
version: 3.0.10
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *76358470
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: kaminari
|
27
|
-
requirement: &
|
27
|
+
requirement: &76358100 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 0.12.4
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *76358100
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: abstract
|
38
|
-
requirement: &
|
38
|
+
requirement: &76357760 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *76357760
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: builder
|
49
|
-
requirement: &
|
49
|
+
requirement: &76357360 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 2.1.2
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *76357360
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: jeweler
|
60
|
-
requirement: &
|
60
|
+
requirement: &76356900 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ~>
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: 1.5.2
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *76356900
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rspec
|
71
|
-
requirement: &
|
71
|
+
requirement: &76356130 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ~>
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: 2.6.0
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *76356130
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: rspec-rails
|
82
|
-
requirement: &
|
82
|
+
requirement: &76355880 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ~>
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: 2.6.0
|
88
88
|
type: :development
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *76355880
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: factory_girl
|
93
|
-
requirement: &
|
93
|
+
requirement: &76355570 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ! '>='
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: '0'
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *76355570
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: ffaker
|
104
|
-
requirement: &
|
104
|
+
requirement: &76345000 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,10 +109,10 @@ dependencies:
|
|
109
109
|
version: '0'
|
110
110
|
type: :development
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *76345000
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: ruby-debug19
|
115
|
-
requirement: &
|
115
|
+
requirement: &76344190 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - ! '>='
|
@@ -120,10 +120,10 @@ dependencies:
|
|
120
120
|
version: '0'
|
121
121
|
type: :development
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *76344190
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: cucumber-rails
|
126
|
-
requirement: &
|
126
|
+
requirement: &76343620 !ruby/object:Gem::Requirement
|
127
127
|
none: false
|
128
128
|
requirements:
|
129
129
|
- - ! '>='
|
@@ -131,10 +131,10 @@ dependencies:
|
|
131
131
|
version: '0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
|
-
version_requirements: *
|
134
|
+
version_requirements: *76343620
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: capybara
|
137
|
-
requirement: &
|
137
|
+
requirement: &76342900 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ! '>='
|
@@ -142,10 +142,10 @@ dependencies:
|
|
142
142
|
version: '0'
|
143
143
|
type: :development
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *76342900
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: database_cleaner
|
148
|
-
requirement: &
|
148
|
+
requirement: &76342440 !ruby/object:Gem::Requirement
|
149
149
|
none: false
|
150
150
|
requirements:
|
151
151
|
- - ! '>='
|
@@ -153,10 +153,10 @@ dependencies:
|
|
153
153
|
version: '0'
|
154
154
|
type: :development
|
155
155
|
prerelease: false
|
156
|
-
version_requirements: *
|
156
|
+
version_requirements: *76342440
|
157
157
|
- !ruby/object:Gem::Dependency
|
158
158
|
name: akephalos
|
159
|
-
requirement: &
|
159
|
+
requirement: &76341940 !ruby/object:Gem::Requirement
|
160
160
|
none: false
|
161
161
|
requirements:
|
162
162
|
- - ! '>='
|
@@ -164,7 +164,7 @@ dependencies:
|
|
164
164
|
version: '0'
|
165
165
|
type: :development
|
166
166
|
prerelease: false
|
167
|
-
version_requirements: *
|
167
|
+
version_requirements: *76341940
|
168
168
|
description: ! 'Great Rails CMS, that turns your business logic into good-looking,
|
169
169
|
fully functional workspace. '
|
170
170
|
email: support@ithouse.lv
|
@@ -499,7 +499,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
499
499
|
version: '0'
|
500
500
|
segments:
|
501
501
|
- 0
|
502
|
-
hash:
|
502
|
+
hash: 161329459
|
503
503
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
504
504
|
none: false
|
505
505
|
requirements:
|