diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/config/manifest.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/public_bundle.js | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 56d7f6d..5c3b551 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js | |||
| @@ -1 +1,2 @@ | |||
| 1 | //= link admin_bundle.js | 1 | //= link admin_bundle.js |
| 2 | //= link public_bundle.js | ||
diff --git a/app/assets/javascripts/public_bundle.js b/app/assets/javascripts/public_bundle.js new file mode 100644 index 0000000..b66b4a3 --- /dev/null +++ b/app/assets/javascripts/public_bundle.js | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | //= require jquery | ||
| 2 | //= require_self | ||
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 48e0a5b..5edb614 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | <title><%= page_title %></title> | 12 | <title><%= page_title %></title> |
| 13 | <link rel="stylesheet" href="/stylesheets/ccc.css"> | 13 | <link rel="stylesheet" href="/stylesheets/ccc.css"> |
| 14 | <script src="/javascripts/jquery-1.3.2.min.js"></script> | 14 | <%= javascript_include_tag 'public_bundle' %> |
| 15 | <script src="/javascripts/shadowbox/shadowbox.js"></script> | 15 | <script src="/javascripts/shadowbox/shadowbox.js"></script> |
| 16 | <link rel="stylesheet" href="/stylesheets/shadowbox.css"> | 16 | <link rel="stylesheet" href="/stylesheets/shadowbox.css"> |
| 17 | <script src="/javascripts/public.js"></script> | 17 | <script src="/javascripts/public.js"></script> |