another round of view updates

author: hukl <contact@smyck.org> 2009-02-22 12:52:58 +0100
committer: hukl <contact@smyck.org> 2009-02-22 12:52:58 +0100
commit: c39eb1e9839664deb68b50b2a9db16770d42852c (patch)
tree: e1c6b0ceb1309074e6018ac1a61adb218552154b
parent: e0d5557a9e7f88050da2ccb42e02397952cded0d (diff)
8 files changed, 35 insertions, 18 deletions
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index baf023f..829e26f 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -3,7 +3,6 @@ class NodesController < ApplicationController
  layout 'admin'
  before_filter :login_required
  before_filter :find_node, :only => [
-                              :create, 
                              :show, 
                              :edit, 
                              :update, 
@@ -21,15 +20,18 @@ class NodesController < ApplicationController
  end
  def new
-    @node = Node.new
+    @node = Node.new params[:node]
  end
  def create
-    tmp_node = Node.new( params[:node] )
+    parent = Node.find_by_unique_name(params[:parent_unique_name])
+    parent ||= Node.root
    
-    if request.post? and tmp_node.save
+    @node = Node.new( params[:node] )
-      tmp_node.move_to_child_of @node
+    
-      redirect_to(tmp_node)
+    if request.post? and @node.save
+      @node.move_to_child_of parent
+      redirect_to(@node)
    else
      render :action => :new
    end
diff --git a/app/models/node.rb b/app/models/node.rb
index 170ca1c..a6e3867 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -10,6 +10,9 @@ class Node < ActiveRecord::Base
  # Callbacks
  after_create :initialize_empty_page
  
+  # Validations
+  validates_length_of :slug, :within => 3..40
+  
  # Class methods
  
  # Returns a page for a given node. If no revision is supplied, it returns
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
new file mode 100644
index 0000000..fa616df
--- /dev/null
+++ b/app/views/admin/_menu.html.erb
@@ -0,0 +1,5 @@
+<%= language_selector %> |
+<%= link_to 'Overview', :controller => :admin, :action => 'index' %> |
+<%= link_to 'Nodes', nodes_path %> |
+<%= link_to 'User', users_path %>
+\ No newline at end of file
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 73e3b02..d5b1e6f 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -25,12 +25,7 @@
  
  <body>
    <div id="navigation">
-      <%= language_selector %> |
+      <%= render :partial => 'admin/menu' if current_user %>
-      
-      <%= link_to 'Overview', :controller => :admin, :action => 'index' %> |
-      <%= link_to 'Nodes', nodes_path %> |
-      <%= link_to 'User', users_path %> | Actions:
-      <%= yield :menu %>
    </div>
    <div id="flash">
      <%= flash[:notice] %>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index f6513a7..7ec3be0 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -1,3 +1,9 @@
+<div id='subnavigation'>
+  <%= link_to 'Show', @node %>
+  <%= link_to 'Back', nodes_path %>
+  <%= link_to 'Publish', publish_node_path, :method => :put %>
+</div>
 <h1>Editing page</h1>
 <strong>Sprache:</strong> <%= I18n.locale %> <strong>Pfad:</strong> <%= @node.unique_name %>
@@ -27,9 +33,4 @@
      <%= f.submit "Update" %>
    </p>
  <% end %>
-  <%= link_to 'Show', @node %> |
-  <%= link_to 'Back', nodes_path %> |
-  <%= link_to 'Publish', publish_node_path, :method => :put %>
 </div>
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index 533204d..da69125 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -1,3 +1,6 @@
+<div id="subnavigation">
+  <%= link_to 'Create', new_node_path %>
+</div>
 <h1>Nodes</h1>
 <%= will_paginate @nodes %>
diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb
index 1207413..d657eb3 100644
--- a/app/views/nodes/new.html.erb
+++ b/app/views/nodes/new.html.erb
@@ -1,12 +1,15 @@
 <h1>Create new node</h1>
+<%= error_messages_for :node %>
 <% form_for @node do |f| %>
  <p>
-    <%= f.label 'Parent node' %><br />
+    <%= f.label 'Parent node - Leave empty for top level' %><br />
    <%= text_field_tag :parent_unique_name %>
  </p>
  <p>
    <%= f.label :slug %><br />
    <%= f.text_field :slug %>
  </p>
+  <p><%= f.submit 'Create node' %></p>
 <% end %>
 \ No newline at end of file
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 242806f..0b7e630 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -56,6 +56,11 @@ input[type=text] {
  line-height: 30px;
 }
+#subnavigation {
+  font-size: 15px;
+  padding-top: 10px;
+}
 #navigation a {
  text-decoration: none;
 }
 \ No newline at end of file
author	hukl <contact@smyck.org>	2009-02-22 12:52:58 +0100
committer	hukl <contact@smyck.org>	2009-02-22 12:52:58 +0100
commit	c39eb1e9839664deb68b50b2a9db16770d42852c (patch)
tree	e1c6b0ceb1309074e6018ac1a61adb218552154b
parent	e0d5557a9e7f88050da2ccb42e02397952cded0d (diff)

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb index baf023f..829e26f 100644 --- a/app/controllers/nodes_controller.rb +++ b/app/controllers/nodes_controller.rb
@@ -3,7 +3,6 @@ class NodesController < ApplicationController
3	layout 'admin'	3	layout 'admin'
4	before_filter :login_required	4	before_filter :login_required
5	before_filter :find_node, :only => [	5	before_filter :find_node, :only => [
6	:create,
7	:show,	6	:show,
8	:edit,	7	:edit,
9	:update,	8	:update,
@@ -21,15 +20,18 @@ class NodesController < ApplicationController
21	end	20	end
22		21
23	def new	22	def new
24	@node = Node.new	23	@node = Node.new params[:node]
25	end	24	end
26		25
27	def create	26	def create
28	tmp_node = Node.new( params[:node] )	27	parent = Node.find_by_unique_name(params[:parent_unique_name])
		28	parent \|\|= Node.root
29		29
30	if request.post? and tmp_node.save	30	@node = Node.new( params[:node] )
31	tmp_node.move_to_child_of @node	31
32	redirect_to(tmp_node)	32	if request.post? and @node.save
		33	@node.move_to_child_of parent
		34	redirect_to(@node)
33	else	35	else
34	render :action => :new	36	render :action => :new
35	end	37	end


diff --git a/app/models/node.rb b/app/models/node.rb index 170ca1c..a6e3867 100644 --- a/app/models/node.rb +++ b/app/models/node.rb
@@ -10,6 +10,9 @@ class Node < ActiveRecord::Base
10	# Callbacks	10	# Callbacks
11	after_create :initialize_empty_page	11	after_create :initialize_empty_page
12		12
		13	# Validations
		14	validates_length_of :slug, :within => 3..40
		15
13	# Class methods	16	# Class methods
14		17
15	# Returns a page for a given node. If no revision is supplied, it returns	18	# Returns a page for a given node. If no revision is supplied, it returns


diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb new file mode 100644 index 0000000..fa616df --- /dev/null +++ b/app/views/admin/_menu.html.erb
@@ -0,0 +1,5 @@
		1	<%= language_selector %> \|
		2
		3	<%= link_to 'Overview', :controller => :admin, :action => 'index' %> \|
		4	<%= link_to 'Nodes', nodes_path %> \|
		5	<%= link_to 'User', users_path %> \ No newline at end of file


diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 73e3b02..d5b1e6f 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb
@@ -25,12 +25,7 @@
25		25
26	<body>	26	<body>
27	<div id="navigation">	27	<div id="navigation">
28	<%= language_selector %> \|	28	<%= render :partial => 'admin/menu' if current_user %>
29
30	<%= link_to 'Overview', :controller => :admin, :action => 'index' %> \|
31	<%= link_to 'Nodes', nodes_path %> \|
32	<%= link_to 'User', users_path %> \| Actions:
33	<%= yield :menu %>
34	</div>	29	</div>
35	<div id="flash">	30	<div id="flash">
36	<%= flash[:notice] %>	31	<%= flash[:notice] %>


diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb index f6513a7..7ec3be0 100644 --- a/app/views/nodes/edit.html.erb +++ b/app/views/nodes/edit.html.erb
@@ -1,3 +1,9 @@
		1	<div id='subnavigation'>
		2	<%= link_to 'Show', @node %>
		3	<%= link_to 'Back', nodes_path %>
		4	<%= link_to 'Publish', publish_node_path, :method => :put %>
		5	</div>
		6
1	<h1>Editing page</h1>	7	<h1>Editing page</h1>
2		8
3	<strong>Sprache:</strong> <%= I18n.locale %> <strong>Pfad:</strong> <%= @node.unique_name %>	9	<strong>Sprache:</strong> <%= I18n.locale %> <strong>Pfad:</strong> <%= @node.unique_name %>
@@ -27,9 +33,4 @@
27	<%= f.submit "Update" %>	33	<%= f.submit "Update" %>
28	</p>	34	</p>
29	<% end %>	35	<% end %>
30
31
32	<%= link_to 'Show', @node %> \|
33	<%= link_to 'Back', nodes_path %> \|
34	<%= link_to 'Publish', publish_node_path, :method => :put %>
35	</div>	36	</div>


diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb index 533204d..da69125 100644 --- a/app/views/nodes/index.html.erb +++ b/app/views/nodes/index.html.erb
@@ -1,3 +1,6 @@
		1	<div id="subnavigation">
		2	<%= link_to 'Create', new_node_path %>
		3	</div>
1	<h1>Nodes</h1>	4	<h1>Nodes</h1>
2		5
3	<%= will_paginate @nodes %>	6	<%= will_paginate @nodes %>


diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb index 1207413..d657eb3 100644 --- a/app/views/nodes/new.html.erb +++ b/app/views/nodes/new.html.erb
@@ -1,12 +1,15 @@
1	<h1>Create new node</h1>	1	<h1>Create new node</h1>
2		2
		3	<%= error_messages_for :node %>
		4
3	<% form_for @node do \|f\| %>	5	<% form_for @node do \|f\| %>
4	<p>	6	<p>
5	<%= f.label 'Parent node' %><br />	7	<%= f.label 'Parent node - Leave empty for top level' %><br />
6	<%= text_field_tag :parent_unique_name %>	8	<%= text_field_tag :parent_unique_name %>
7	</p>	9	</p>
8	<p>	10	<p>
9	<%= f.label :slug %><br />	11	<%= f.label :slug %><br />
10	<%= f.text_field :slug %>	12	<%= f.text_field :slug %>
11	</p>	13	</p>
		14	<p><%= f.submit 'Create node' %></p>
12	<% end %> \ No newline at end of file	15	<% end %> \ No newline at end of file


diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css index 242806f..0b7e630 100644 --- a/public/stylesheets/admin.css +++ b/public/stylesheets/admin.css
@@ -56,6 +56,11 @@ input[type=text] {
56	line-height: 30px;	56	line-height: 30px;
57	}	57	}
58		58
		59	#subnavigation {
		60	font-size: 15px;
		61	padding-top: 10px;
		62	}
		63
59	#navigation a {	64	#navigation a {
60	text-decoration: none;	65	text-decoration: none;
61	} \ No newline at end of file	66	} \ No newline at end of file