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

Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2015-07-16 19:43:23 +08:00
parent d2f21f5221 afe1ffd437
commit ee4f7e06e8
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
<% if params[:action] == "new" %> <% if params[:action] == "new" %>
<%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:page)+' ID' %> <%= 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;detect_chinese;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;Page ID cannot be in chinese.;"} %> <%= f.text_field :page_id, class:"input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;detect_chinese;cannot_have_dash;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;Page ID cannot be in chinese.;Cannot have dash (-) in Page ID.;"} %>
<span><%= t("front_page.name_field_helper") %></span> <span><%= t("front_page.name_field_helper") %></span>
</div> </div>
<% end %> <% end %>

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

@ -5,7 +5,7 @@
<% if params[:action] == "new" %> <% if params[:action] == "new" %>
<%= f.label :name, content_tag(:i, nil, :class => "icons-star")+t(:link)+' ID' %> <%= 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;detect_chinese;cannot_have_dash;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id is already taken.;Page ID cannot be in chinese.;Cannot have dash (-) in Page ID.;"} %>
<span class="help-block"><%= t("front_page.name_field_helper") %></span> <span class="help-block"><%= t("front_page.name_field_helper") %></span>
</div> </div>
<% end %> <% end %>

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

@ -23,5 +23,9 @@ $(document).ready(function(){
re2 = new RegExp("^[\uE7C7-\uE7F3]*$"); //Chinese character range re2 = new RegExp("^[\uE7C7-\uE7F3]*$"); //Chinese character range
return (!(re1.test(value) && (! re2.test(value)))); return (!(re1.test(value) && (! re2.test(value))));
} }
fromvalidator.validate_functions.cannot_have_dash = function(value){
return (value.indexOf("-") == -1 ? true : false);
}
}) })
</script> </script>