summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorhukl <contact@smyck.org>2009-09-17 11:03:35 +0200
committerhukl <contact@smyck.org>2009-09-17 11:03:35 +0200
commitf952040dd44b914b2d5e405567eb655757dfc85d (patch)
tree7e210b01734bd7f311009c705e80027e85468cca /app
parentbb4afc944049652f1c51124808fd64de6ebe338a (diff)
added shadowbody, first js gallery initializer and template modifications
Diffstat (limited to 'app')
-rw-r--r--app/views/custom/page_templates/public/no_date_and_author.html.erb2
-rw-r--r--app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb2
-rw-r--r--app/views/custom/page_templates/public/standard_template.html.erb2
-rw-r--r--app/views/layouts/application.html.erb9
4 files changed, 12 insertions, 3 deletions
diff --git a/app/views/custom/page_templates/public/no_date_and_author.html.erb b/app/views/custom/page_templates/public/no_date_and_author.html.erb
index 27cc1c0..08911ff 100644
--- a/app/views/custom/page_templates/public/no_date_and_author.html.erb
+++ b/app/views/custom/page_templates/public/no_date_and_author.html.erb
@@ -2,7 +2,7 @@
2 <h2><%= @page.title %></h2> 2 <h2><%= @page.title %></h2>
3 <hr class="subtitle" /> 3 <hr class="subtitle" />
4 <p><em><%= @page.abstract %></em></p> 4 <p><em><%= @page.abstract %></em></p>
5 <p><%= headline_image %></p> 5 <div id="headline_image"><%= headline_image %></div>
6 <%= aggregate?(@page.body) %> 6 <%= aggregate?(@page.body) %>
7</div> 7</div>
8 8
diff --git a/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb b/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb
index eab658c..83cbff6 100644
--- a/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb
+++ b/app/views/custom/page_templates/public/no_title_abstract_date_and_author.html.erb
@@ -1,5 +1,5 @@
1<div class="article"> 1<div class="article">
2 <div><%= headline_image %></div> 2 <div id="headline_image"><%= headline_image %></div>
3 <%= aggregate?(@page.body) %> 3 <%= aggregate?(@page.body) %>
4</div> 4</div>
5 5
diff --git a/app/views/custom/page_templates/public/standard_template.html.erb b/app/views/custom/page_templates/public/standard_template.html.erb
index 7893fdd..9ce3e94 100644
--- a/app/views/custom/page_templates/public/standard_template.html.erb
+++ b/app/views/custom/page_templates/public/standard_template.html.erb
@@ -3,7 +3,7 @@
3 <h3><%= date_for_page @page %>, <%= @page.user.try(:login) %></h3> 3 <h3><%= date_for_page @page %>, <%= @page.user.try(:login) %></h3>
4 <hr class="subtitle" /> 4 <hr class="subtitle" />
5 <p><em><%= @page.abstract %></em></p> 5 <p><em><%= @page.abstract %></em></p>
6 <p><%= headline_image %></p> 6 <div id="headline_image"><%= headline_image %></div>
7 <%= aggregate?(@page.body) %> 7 <%= aggregate?(@page.body) %>
8</div> 8</div>
9 9
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2239c17..efa8c5d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -7,6 +7,15 @@
7 7
8 <title><%= page_title %></title> 8 <title><%= page_title %></title>
9 <%= stylesheet_link_tag "ccc" %> 9 <%= stylesheet_link_tag "ccc" %>
10 <%= javascript_include_tag 'jquery-1.3.2.min' %>
11 <%= javascript_include_tag 'shadowbox/shadowbox' %>
12 <%= javascript_include_tag 'public' %>
13 <%= stylesheet_link_tag "shadowbox" %>
14
15 <script type="text/javascript" charset="utf-8">
16 Shadowbox.init();
17 </script>
18
10 <%= auto_discovery_link_tag(:rss, {:controller => "rss", :action => "updates"}) %> 19 <%= auto_discovery_link_tag(:rss, {:controller => "rss", :action => "updates"}) %>
11 </head> 20 </head>
12 21