cleaning up 'and continue' functionality

Oleg committed May 05, 2011

commit 0cf3695ce5784b204cc43a16474c6f98e87d28de

app/views/cms_admin/layouts/_form.html.erb +5 -0

@@	@@ -14,3 +14,8 @@
	<%= form.text_area :content, :class => 'code' %>
	<%= form.text_area :css, :class => 'code_css' %>
	<%= form.text_area :js, :class => 'code_js' %>
+
+	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
+	<%= form.submit 'and continue', :id => nil, :disable_builder => true %>
+	<%= form.submit @cms_layout.new_record?? 'Create Layout' : 'Update Layout', :name => 'save', :disable_builder => true %>
+	<% end %>
	\ No newline at end of file

app/views/cms_admin/layouts/edit.html.erb +0 -4

@@	@@ -2,8 +2,4 @@

	<%= cms_form_for @cms_layout, :url => {:action => :update} do \|form\| %>
	<%= render :partial => 'form', :object => form %>
-	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
-	<%= form.submit 'Update Layout', :disable_builder => true %>
-	<%= form.submit 'Update & Edit'.html_safe, :name => "save", :disable_builder => true %>
-	<% end %>
	<% end %>
	\ No newline at end of file

app/views/cms_admin/layouts/new.html.erb +0 -4

@@	@@ -2,8 +2,4 @@

	<%= cms_form_for @cms_layout, :url => {:action => :create} do \|form\| %>
	<%= render :partial => 'form', :object => form %>
-	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
-	<%= form.submit 'Create Layout', :disable_builder => true %>
-	<%= form.submit 'Create & Edit'.html_safe, :name => "save", :disable_builder => true %>
-	<% end %>
	<% end %>
	\ No newline at end of file

app/views/cms_admin/pages/_form.html.erb +3 -5

@@	@@ -32,9 +32,7 @@
	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
	<%= form.check_box :is_published, :disable_builder => true %>
	<%= form.label_for :is_published, :label => 'Published' %>
-	<%= form.submit 'Preview', :name => 'preview', :id => 'cms_page_preview', :disable_builder => true %>
-	<% end %>
-	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
-	<%= form.submit @cms_page.new_record? ? 'Create Page' : 'Update Page', :disable_builder => true %>
-	<%= form.submit @cms_page.new_record? ? 'Create & Edit'.html_safe : 'Update & Edit'.html_safe, :name => "save", :disable_builder => true %>
+	<%= form.submit 'Preview', :name => 'preview', :id => nil, :disable_builder => true %>
+	<%= form.submit 'and continue', :id => nil, :disable_builder => true %>
+	<%= form.submit @cms_page.new_record? ? 'Create Page' : 'Update Page', :name => 'save', :disable_builder => true %>
	<% end %>
	\ No newline at end of file

app/views/cms_admin/sites/_form.html.erb +6 -1

@@	@@ -1,2 +1,7 @@
	<%= form.text_field :label %>
-	<%= form.text_field :hostname %>
	\ No newline at end of file
+	<%= form.text_field :hostname %>
+
+	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
+	<%= form.submit 'and continue', :id => nil, :disable_builder => true %>
+	<%= form.submit @cms_site.new_record?? 'Create Site' : 'Update Site', :name => 'save', :disable_builder => true %>
+	<% end %>
	\ No newline at end of file

app/views/cms_admin/sites/edit.html.erb +0 -4

@@	@@ -2,8 +2,4 @@

	<%= cms_form_for @cms_site, :url => {:action => :update} do \|form\| %>
	<%= render :partial => 'form', :object => form %>
-	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
-	<%= form.submit 'Update Site', :disable_builder => true %>
-	<%= form.submit 'Update & Edit'.html_safe, :name => "save", :disable_builder => true%>
-	<% end %>
	<% end %>
	\ No newline at end of file

app/views/cms_admin/sites/new.html.erb +0 -4

@@	@@ -2,8 +2,4 @@

	<%= cms_form_for @cms_site, :url => {:action => :create} do \|form\| %>
	<%= render :partial => 'form', :object => form %>
-	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
-	<%= form.submit 'Create Site', :disable_builder => true %>
-	<%= form.submit 'Create & Edit'.html_safe, :name => "save", :disable_builder => true%>
-	<% end %>
	<% end %>
	\ No newline at end of file

app/views/cms_admin/snippets/_form.html.erb +6 -1

@@	@@ -4,4 +4,9 @@

	<%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil) %>
	<%= form.text_field :slug, :id => 'slug', :class => 'delimiter-underscore' %>
-	<%= form.text_area :content, :class => 'code' %>
	\ No newline at end of file
+	<%= form.text_area :content, :class => 'code' %>
+
+	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
+	<%= form.submit 'and continue', :id => nil, :disable_builder => true %>
+	<%= form.submit @cms_snippet.new_record?? 'Create Snippet' : 'Update Snippet', :name => 'save', :disable_builder => true %>
+	<% end %>
	\ No newline at end of file

app/views/cms_admin/snippets/edit.html.erb +0 -4

@@	@@ -2,8 +2,4 @@

	<%= cms_form_for @cms_snippet, :url => {:action => :update} do \|form\| %>
	<%= render :partial => 'form', :object => form %>
-	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
-	<%= form.submit 'Update Snippet', :disable_builder => true %>
-	<%= form.submit 'Update & Edit'.html_safe, :name => "save", :disable_builder => true %>
-	<% end %>
	<% end %>
	\ No newline at end of file

app/views/cms_admin/snippets/new.html.erb +0 -4

@@	@@ -2,8 +2,4 @@

	<%= cms_form_for @cms_snippet, :url => {:action => :create} do \|form\| %>
	<%= render :partial => 'form', :object => form %>
-	<%= form.simple_field nil, nil, :class => 'submit_element' do %>
-	<%= form.submit 'Create Snippet', :disable_builder => true %>
-	<%= form.submit 'Create & Edit'.html_safe, :name => "save", :disable_builder => true %>
-	<% end %>
	<% end %>
	\ No newline at end of file

public/stylesheets/comfortable_mexican_sofa/form.css +5 -0

@@	@@ -19,6 +19,7 @@
	}
	.form_element .value {
	margin-left: 150px;
+	overflow: hidden;
	}
	.form_element .value input[type='text'],
	.form_element .value input[type='password'],
@@	@@ -82,6 +83,10 @@
	.form_element.submit_element label {
	margin: 0px 5px;
	}
+	.form_element.submit_element input[name='commit'],
+	.form_element.submit_element input[name='save'] {
+	float: right;
+	}
	.form_element .desc {
	margin: 2px 0px 0px 150px;
	font-size: 11px;