Merge branch 'master' of github.com:hukl/cccms

author: hukl <hukl@eyelyn.local> 2009-11-10 22:47:22 +0100
committer: hukl <hukl@eyelyn.local> 2009-11-10 22:47:22 +0100
commit: 7e2375dedfd8361212bc5b0055bdeb042010ffca (patch)
tree: 9c33c647cfbc6a39f7dd538dd23a6583adac40cb /app
parent: a150d9893e85d8f0e026b926768986f744f16eee (diff)
parent: de0647b6b5af45037b75c4e2ddb32d6aed752233 (diff)
6 files changed, 13 insertions, 12 deletions
diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb
index 9eb7d7e..1e56488 100644
--- a/app/helpers/content_helper.rb
+++ b/app/helpers/content_helper.rb
@@ -91,7 +91,7 @@ module ContentHelper
      end
      
    rescue
-      sanatize( content )
+      sanitize( content )
    end
  end
  
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index f2875aa..e8b39ce 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,5 +1,5 @@
 <%= language_selector %>
+<%= link_to 'Logout', :controller => :sessions, :action => :destroy %>
 <%= link_to 'Overview', :controller => :admin, :action => 'index' %>
 <%= link_to 'Nodes', nodes_path, selected?('nodes') %>
 <%= link_to 'Assets', assets_path, selected?('assets') %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c7704ac..cc4c01b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -12,7 +12,7 @@
    <%= stylesheet_link_tag "shadowbox" %>
    <%= javascript_include_tag 'public' %>
    
-    <%= auto_discovery_link_tag(:rss, {:controller => "rss", :action => "updates"}) %>
+    <%= auto_discovery_link_tag(:atom, {:controller => "rss", :action => "updates"}) %>
  </head>
  
  <body>
diff --git a/app/views/rss/updates.xml.builder b/app/views/rss/updates.xml.builder
index 6be49e9..451e724 100644
--- a/app/views/rss/updates.xml.builder
+++ b/app/views/rss/updates.xml.builder
@@ -3,21 +3,22 @@ xml.instruct!
 xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
  xml.title("Chaos Computer Club Updates")
  xml.link(:href => "http://www.ccc.de/")
-  xml.link(:rel => "self", :href => "/rss/updates.xml")
+  xml.link(:rel => "self", :href => "#{@host}/rss/updates")
  xml.updated(@items.first.published_at.xmlschema)
  xml.author do
    xml.name("Chaos Computer Club e.V.")
  end
-  xml.id("http://www.ccc.de/")
+  xml.id("#{@host}/rss/updates")
  
  @items.each do |item|
    xml.entry do
      xml.title(item.title)
      xml.link(
-        :href => content_path_helper(item.node.unique_path),
+        :href => "#{@host}/de/#{item.node.unique_name}",
-        :rel => "alternate"
+        :rel  => "alternate",
+        :type => "text/html"
      )
-      xml.id(content_url_helper(item.node.unique_path))
+      xml.id("#{@host}/de/#{item.node.unique_name}")
      xml.updated(item.published_at.xmlschema)
      xml.content(:type => "xhtml") do
        xml.div(item.body, :xmlns => "http://www.w3.org/1999/xhtml")
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 63dfd9c..226e821 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -14,11 +14,11 @@
  </tr>
  <tr>
    <td class="description">Password</td>
-    <td><%= f.text_field :password %></td>
+    <td><%= f.password_field :password %></td>
  </tr>
  <tr>
    <td class="description">Confirm</td>
-    <td><%= f.text_field :password_confirmation %></td>
+    <td><%= f.password_field :password_confirmation %></td>
  </tr>
  <% if current_user.admin? %>
  <tr>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 8bd21d6..6990c27 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -14,11 +14,11 @@
  </tr>
  <tr>
    <td class="description">Password</td>
-    <td><%= f.text_field :password %></td>
+    <td><%= f.password_field :password %></td>
  </tr>
  <tr>
    <td class="description">Confirm</td>
-    <td><%= f.text_field :password_confirmation %></td>
+    <td><%= f.password_field :password_confirmation %></td>
  </tr>
  <tr>
    <td class="description">Admin?</td>
author	hukl <hukl@eyelyn.local>	2009-11-10 22:47:22 +0100
committer	hukl <hukl@eyelyn.local>	2009-11-10 22:47:22 +0100
commit	7e2375dedfd8361212bc5b0055bdeb042010ffca (patch)
tree	9c33c647cfbc6a39f7dd538dd23a6583adac40cb /app
parent	a150d9893e85d8f0e026b926768986f744f16eee (diff)
parent	de0647b6b5af45037b75c4e2ddb32d6aed752233 (diff)

diff --git a/app/helpers/content_helper.rb b/app/helpers/content_helper.rb index 9eb7d7e..1e56488 100644 --- a/app/helpers/content_helper.rb +++ b/app/helpers/content_helper.rb
@@ -91,7 +91,7 @@ module ContentHelper
91	end	91	end
92		92
93	rescue	93	rescue
94	sanatize( content )	94	sanitize( content )
95	end	95	end
96	end	96	end
97		97


diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index f2875aa..e8b39ce 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb
@@ -1,5 +1,5 @@
1	<%= language_selector %>	1	<%= language_selector %>
2		2	<%= link_to 'Logout', :controller => :sessions, :action => :destroy %>
3	<%= link_to 'Overview', :controller => :admin, :action => 'index' %>	3	<%= link_to 'Overview', :controller => :admin, :action => 'index' %>
4	<%= link_to 'Nodes', nodes_path, selected?('nodes') %>	4	<%= link_to 'Nodes', nodes_path, selected?('nodes') %>
5	<%= link_to 'Assets', assets_path, selected?('assets') %>	5	<%= link_to 'Assets', assets_path, selected?('assets') %>


diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c7704ac..cc4c01b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb
@@ -12,7 +12,7 @@
12	<%= stylesheet_link_tag "shadowbox" %>	12	<%= stylesheet_link_tag "shadowbox" %>
13	<%= javascript_include_tag 'public' %>	13	<%= javascript_include_tag 'public' %>
14		14
15	<%= auto_discovery_link_tag(:rss, {:controller => "rss", :action => "updates"}) %>	15	<%= auto_discovery_link_tag(:atom, {:controller => "rss", :action => "updates"}) %>
16	</head>	16	</head>
17		17
18	<body>	18	<body>


diff --git a/app/views/rss/updates.xml.builder b/app/views/rss/updates.xml.builder index 6be49e9..451e724 100644 --- a/app/views/rss/updates.xml.builder +++ b/app/views/rss/updates.xml.builder
@@ -3,21 +3,22 @@ xml.instruct!
3	xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do	3	xml.feed(:xmlns => "http://www.w3.org/2005/Atom", "xml:base" => @host) do
4	xml.title("Chaos Computer Club Updates")	4	xml.title("Chaos Computer Club Updates")
5	xml.link(:href => "http://www.ccc.de/")	5	xml.link(:href => "http://www.ccc.de/")
6	xml.link(:rel => "self", :href => "/rss/updates.xml")	6	xml.link(:rel => "self", :href => "#{@host}/rss/updates")
7	xml.updated(@items.first.published_at.xmlschema)	7	xml.updated(@items.first.published_at.xmlschema)
8	xml.author do	8	xml.author do
9	xml.name("Chaos Computer Club e.V.")	9	xml.name("Chaos Computer Club e.V.")
10	end	10	end
11	xml.id("http://www.ccc.de/")	11	xml.id("#{@host}/rss/updates")
12		12
13	@items.each do \|item\|	13	@items.each do \|item\|
14	xml.entry do	14	xml.entry do
15	xml.title(item.title)	15	xml.title(item.title)
16	xml.link(	16	xml.link(
17	:href => content_path_helper(item.node.unique_path),	17	:href => "#{@host}/de/#{item.node.unique_name}",
18	:rel => "alternate"	18	:rel => "alternate",
		19	:type => "text/html"
19	)	20	)
20	xml.id(content_url_helper(item.node.unique_path))	21	xml.id("#{@host}/de/#{item.node.unique_name}")
21	xml.updated(item.published_at.xmlschema)	22	xml.updated(item.published_at.xmlschema)
22	xml.content(:type => "xhtml") do	23	xml.content(:type => "xhtml") do
23	xml.div(item.body, :xmlns => "http://www.w3.org/1999/xhtml")	24	xml.div(item.body, :xmlns => "http://www.w3.org/1999/xhtml")


diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 63dfd9c..226e821 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb
@@ -14,11 +14,11 @@
14	</tr>	14	</tr>
15	<tr>	15	<tr>
16	<td class="description">Password</td>	16	<td class="description">Password</td>
17	<td><%= f.text_field :password %></td>	17	<td><%= f.password_field :password %></td>
18	</tr>	18	</tr>
19	<tr>	19	<tr>
20	<td class="description">Confirm</td>	20	<td class="description">Confirm</td>
21	<td><%= f.text_field :password_confirmation %></td>	21	<td><%= f.password_field :password_confirmation %></td>
22	</tr>	22	</tr>
23	<% if current_user.admin? %>	23	<% if current_user.admin? %>
24	<tr>	24	<tr>


diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 8bd21d6..6990c27 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb
@@ -14,11 +14,11 @@
14	</tr>	14	</tr>
15	<tr>	15	<tr>
16	<td class="description">Password</td>	16	<td class="description">Password</td>
17	<td><%= f.text_field :password %></td>	17	<td><%= f.password_field :password %></td>
18	</tr>	18	</tr>
19	<tr>	19	<tr>
20	<td class="description">Confirm</td>	20	<td class="description">Confirm</td>
21	<td><%= f.text_field :password_confirmation %></td>	21	<td><%= f.password_field :password_confirmation %></td>
22	</tr>	22	</tr>
23	<tr>	23	<tr>
24	<td class="description">Admin?</td>	24	<td class="description">Admin?</td>