alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some bug in structure page form

This commit is contained in:
manson 2014-08-01 21:05:21 +08:00
parent f3882eee10
commit c5b501845c
4 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/pages/_form.html.erb
View File

@ -3,7 +3,7 @@
<% end %> <% end %>
<div class="control-group"> <div class="control-group">
<% if params[:action] == "new" %> <% if params[:action] == "new" %>
<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %> <%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:page)+' ID' %>
<div class="controls"> <div class="controls">
<%= f.text_field :page_id, class:"input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;"} %> <%= f.text_field :page_id, class:"input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;"} %>
<span class="help-block"><%= t("front_page.name_field_helper") %></span> <span class="help-block"><%= t("front_page.name_field_helper") %></span>

9
app/views/pages/_form_link.html.erb
View File

@ -3,9 +3,10 @@
<% end %> <% end %>
<div class="control-group"> <div class="control-group">
<% if params[:action] == "new" %> <% if params[:action] == "new" %>
<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:name) %> <%= f.label :name, content_tag(:i, nil, :class => "icons-star")+t(:link)+' ID' %>
<div class="controls"> <div class="controls">
<%= f.text_field :page_id, class: "input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id is already taken.;"} %> <%= f.text_field :page_id, class: "input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id is already taken.;"} %>
<span class="help-block"><%= t("front_page.name_field_helper") %></span>
</div> </div>
<% end %> <% end %>
<div class="controls"> <div class="controls">
@ -16,7 +17,7 @@
<div class="control-group"> <div class="control-group">
<% @site_in_use_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<label class="control-label">Link name (<%= t(locale.to_s) %>) :</label> <label class="control-label"><%= "#{t(:title)} #{t(locale)}" %></label>
<div class="controls"> <div class="controls">
<%= f.fields_for :name_translations do |n| %> <%= f.fields_for :name_translations do |n| %>
<%= n.text_field locale, class:"input-xlarge change", data: {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"}, :value=>@page.name_translations[locale] rescue nil %> <%= n.text_field locale, class:"input-xlarge change", data: {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"}, :value=>@page.name_translations[locale] rescue nil %>
@ -26,11 +27,11 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<% @site_in_use_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<label class="control-label">Url (<%= t(locale.to_s) %>) :</label> <label class="control-label"><%= "#{t(:url)} #{t(locale)}" %></label>
<div class="controls"> <div class="controls">
<%= f.fields_for :external_url_translations do |n| %> <%= f.fields_for :external_url_translations do |n| %>
<% <%
if params[:action] == "edit" if params[:action] == "edit" and !@page.external_url_translations[locale].blank?
temp_url = @page.external_url_translations[locale] temp_url = @page.external_url_translations[locale]
temp_url = URI.parse(temp_url) temp_url = URI.parse(temp_url)
url = "" url = ""

30
app/views/pages/edit.html.erb
View File

@ -1,22 +1,18 @@
<%= form_for @page, url: {action: "update"},:class =>"form-horizontal", remote: true do |f| %> <%= form_for @page, url: {action: "update"},:class =>"form-horizontal", remote: true do |f| %>
<% if params[:type] == "page" %> <% if params[:type] == "page" %>
<%= render "form", {:f=> f} %> <%= render "form", {:f=> f} %>
<% elsif params[:type] == "link" %> <% elsif params[:type] == "link" %>
<%= render "form_link", {:f=> f} %> <%= render "form_link", {:f=> f} %>
<% end %> <% end %>
<div class="form-actions"> <div class="form-actions">
<% if params[:type] == "page" %> <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a> <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
<%= f.submit t(:submit), class: 'btn btn-primary btn-small' %> </div>
<% elsif params[:type] == "link" %>
<%= f.submit "Update Link", :class=>"btn btn-primary" %>
<% end %>
</div>
<% end %> <% end %>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
var fromvalidator = new FormValidator($("form.edit_page")); var fromvalidator = new FormValidator($("form.edit_page"));
}) })
</script> </script>

36
app/views/pages/new.html.erb
View File

@ -1,25 +1,21 @@
<%= form_for @page, url: {action: "create"},:class =>"form-horizontal", :remote => true do |f| %> <%= form_for @page, url: {action: "create"},:class =>"form-horizontal", :remote => true do |f| %>
<% if params[:type] == "page" %> <% if params[:type] == "page" %>
<%= render "form", {:f=> f} %> <%= render "form", {:f=> f} %>
<% elsif params[:type] == "link" %> <% elsif params[:type] == "link" %>
<%= render "form_link", {:f=> f} %> <%= render "form_link", {:f=> f} %>
<% end %> <% end %>
<div class="form-actions"> <div class="form-actions">
<% if params[:type] == "page" %> <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
<a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a> <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
<%= f.submit t(:submit), class: 'btn btn-primary btn-small' %> </div>
<% elsif params[:type] == "link" %>
<%= f.submit "Create Link", :class=>"btn btn-primary" %>
<% end %>
</div>
<% end %> <% end %>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
var pageids = <%= Page.all.collect{|page| page.page_id}.to_json.html_safe %> var pageids = <%= Page.all.collect{|page| page.page_id}.to_json.html_safe %>
var fromvalidator = new FormValidator($("#new_page")); var fromvalidator = new FormValidator($("#new_page"));
fromvalidator.validate_functions.pageid_validation = function(value){ fromvalidator.validate_functions.pageid_validation = function(value){
return (pageids.indexOf(value) == -1 ? true : false); return (pageids.indexOf(value) == -1 ? true : false);
} }
}) })
</script> </script>