caboose-cms 0.3.70 → 0.3.71

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 (5) hide show
  1. checksums.yaml +8 -8
  2. data/app/views/caboose/login/index.html.erb +28 -37
  3. data/lib/caboose/engine.rb +2 -1
  4. data/lib/caboose/version.rb +1 -1
  5. metadata +16 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MTZjZTY1NTk1MmVmMDM1NzUwNmVlNzg5MWE1ODc1NThjNjAwNmNmZA==
4
+ NjI5YjBiYjQzMmJmYjdkMGZhYTkwNzczNzdmMGNiNmMyZGU4NzI1MQ==
5
5
  data.tar.gz: !binary |-
6
- OGIzZjhkNzkyOTI0MDY0M2ZmYzA2OTRkNGIzNWNlNDIwYjVlYzhjYQ==
6
+ MWE3MDg1OTc5ODJhNjczZWVhNDIyNWM0Njg3ZWI3ODdkZmI1MmZiZg==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- YzQyZjczNWQ4MDY4ZDlmNzY3ZDQ3NTRlZjI5Yzg1M2RiYzhiYzdjM2EzOTk4
10
- MjcwNTFiZGM1ZGEyNjBhNGYxODI0NGZkMTYwMmUwNGJiZmZhMjA3ZGM3YjNm
11
- YTFjZjZhYmJjZTRkZDkyZDA2OTcyZWFlNzc5ZDNjYWIwZmE4ODM=
9
+ NzBmZjM5M2FhZDA3YTQzNjMwMzVlM2MxNzM0ZmYzZTM5YzM2NTIyNmIwN2Yx
10
+ M2Q5Yjg1YTE2Yjg5MGU4NGQ2MjZmMGRhN2I4MDNjMDMwYjAyYzBhZmE5MDc3
11
+ NDE3NzZjZWE4NDRiY2MwZjMwMzkyMjllOWUyZjBiNjljOTFhOTM=
12
12
  data.tar.gz: !binary |-
13
- NjJhNDI5OTczMTRkZDhhMDMyODNkYzM5N2E4OWVmNzRkYmU3YjdlMDBmYTdi
14
- OGFhNDljZmE5OWMwODIyNjNjYzM1MThlOWQ4ZTk4NjU0YmNjODM3NWRiZTA4
15
- OTM1ZGJiYTJkZmZiZjg4ZWYwOWI5MTA4YWNlNzUxZmYxZDI5ZDU=
13
+ NWU5ZjRlOGJkYjEyMGYwYmI0YjEyNWU2YjIyNGU3NmI1MGQ3ODY1MDVjNDFm
14
+ Y2M2NGEzY2NiNzkyY2Q2ZjdhNDQxN2ViNzJiZTgyZDc0MjA1NTMwZDUwY2Vi
15
+ YmUwMjQxN2VjNTg0MzdlZTk4M2Q4M2QwYzY1ODQyNTk5ZGY4M2Y=
data/app/views/caboose/login/index.html.erb CHANGED
@@ -22,46 +22,37 @@
22
22
  </p>
23
23
  </form>
24
24
 
25
- <% content_for :caboose_css do %>
26
- <%= stylesheet_link_tag 'caboose/login' %>
27
-
28
- <style type="text/css">
29
- #modal_content input[type=checkbox] { position: relative; }
30
- </style>
25
+ <%= content_for :caboose_css do %>
26
+ <%= stylesheet_link_tag "caboose/login", media: "all" %>
27
+ <style type="text/css">
28
+ #modal_content input[type=checkbox] { position: relative; }
29
+ </style>
31
30
  <% end %>
32
31
 
33
32
  <% content_for :caboose_js do %>
34
- <script type="text/javascript">
35
- var modal = false;
36
-
37
- $(window).load(function() {
38
- modal = new CabooseModal(400);
39
- });
40
-
41
- function login() {
42
- modal.autosize("<p class='loading'>Logging in...</p>");
33
+ <script type="text/javascript">
34
+ var modal = false;
43
35
 
44
- $.ajax({
45
- url: '/login',
46
- type: 'post',
47
- data: $('#login-form').serialize(),
48
- success: function(response) {
49
- if (response.error) {
50
- modal.autosize("<p class='note error'>" + response.error + "</p>");
51
- } else if (response.redirect != false) {
52
- <%= @modal ? "" : "parent." %>window.location = response.redirect;
53
- } else {
54
- parent.location.reload(true);
55
- }
56
- },
57
- error: function() {
58
- modal.autosize("<p class='note error'>Error</p>");
59
- }
60
- });
61
- }
62
- </script>
63
- <% end %>
36
+ $(window).load(function() {
37
+ modal = new CabooseModal(400);
38
+ });
39
+
40
+ function login() {
41
+ modal.autosize("<p class='loading'>Logging in...</p>");
64
42
 
65
- <%= content_for :caboose_css do %>
66
- <%= stylesheet_link_tag "caboose/login", media: "all" %>
43
+ $.ajax({
44
+ url: '/login',
45
+ type: 'post',
46
+ data: $('#login-form').serialize(),
47
+ success: function(response) {
48
+ if (response.error) modal.autosize("<p class='note error'>" + response.error + "</p>");
49
+ else if (response.redirect != false) <%= @modal ? "" : "parent." %>window.location = response.redirect;
50
+ else parent.location.reload(true);
51
+ },
52
+ error: function() {
53
+ modal.autosize("<p class='note error'>Error</p>");
54
+ }
55
+ });
56
+ }
57
+ </script>
67
58
  <% end %>
data/lib/caboose/engine.rb CHANGED
@@ -63,7 +63,8 @@ module Caboose
63
63
  end
64
64
 
65
65
  class Engine < ::Rails::Engine
66
- isolate_namespace Caboose
66
+ isolate_namespace Caboose
67
+ require 'jquery-rails'
67
68
  initializer 'caboose.assets.precompile' do |app|
68
69
  app.config.assets.precompile += [
69
70
  # Images
data/lib/caboose/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.3.70'
2
+ VERSION = '0.3.71'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.70
4
+ version: 0.3.71
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-20 00:00:00.000000000 Z
11
+ date: 2014-03-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -136,6 +136,20 @@ dependencies:
136
136
  - - ! '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
+ - !ruby/object:Gem::Dependency
140
+ name: ejs
141
+ requirement: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - ! '>='
144
+ - !ruby/object:Gem::Version
145
+ version: '0'
146
+ type: :runtime
147
+ prerelease: false
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - ! '>='
151
+ - !ruby/object:Gem::Version
152
+ version: '0'
139
153
  description: CMS built on rails with love.
140
154
  email:
141
155
  - william@nine.is