sunrise-cms 1.1.1 → 2.0.0

data/README.md

@@ -1,25 +1,33 @@
 # Sunrise CMS
 
+[![Tests](https://github.com/galetahub/sunrise/actions/workflows/tests.yml/badge.svg)](https://github.com/galetahub/sunrise/actions/workflows/tests.yml)
+
 Open source mini content management system for programmers.
 
 ## Setup
 
+For rails 7.x.x:
+
+```ruby
+gem 'sunrise-cms', '~> 2.0', require: 'sunrise'
+```
+
 For rails 5.x.x:
 
 ```ruby
-  gem 'sunrise-cms', '~> 1.1.0', require: 'sunrise'
+gem 'sunrise-cms', '~> 1.1.0', require: 'sunrise'
 ```
 
 For rails 4.x.x:
 
 ```ruby
-  gem "sunrise-cms", :require => "sunrise"
+gem "sunrise-cms", require: "sunrise"
 ```
 
 For rails 3.x.x:
 
 ```ruby
-  gem "sunrise-cms", "~> 0.7.x" :require => "sunrise"
+gem "sunrise-cms", "~> 0.7.x" require: "sunrise"
 ```
 
 ## Instructions
@@ -27,23 +35,23 @@ For rails 3.x.x:
 ### ActiveRecord
 
 ```bash
-$> rails g devise:install
-$> rails g sunrise:install --orm=active_record
+rails g devise:install
+rails g sunrise:install --orm=active_record
 ```
 
 Copy db migrations files:
 
 ```bash
-$> rake sunrise:install:migrations
-$> rake page_parts_engine:install:migrations
-$> rake meta_manager_engine:install:migrations
-$> rails g public_activity:migration
+rake sunrise:install:migrations
+rake page_parts_engine:install:migrations
+rake meta_manager_engine:install:migrations
+rails g public_activity:migration
 ```
 
 ### Mongoid
 
 ```bash
-$> rails g sunrise:install --orm=mongoid
+rails g sunrise:install --orm=mongoid
 ```
 
 ## Usage
@@ -57,7 +65,7 @@ class SunriseProduct < Sunrise::AbstractModel
   association :structure
 
   after_sort :clear_cache
-  
+
   index :thumbs do
     scope { Product.includes(:picture) }
     preview lambda { |product| product.picture.try(:url, :thumb) }
@@ -78,7 +86,7 @@ class SunriseProduct < Sunrise::AbstractModel
     field :unique_accounts_count
     field :total_points
   end
-  
+
   show do
     field :title
     field :price
@@ -86,43 +94,43 @@ class SunriseProduct < Sunrise::AbstractModel
     field :sort_order
     field :is_visible
   end
-  
+
   form do
     field :title
     field :price
     field :total_stock
-    
+
     field do |form, record|
-      form.input :notes, :as => :text, :id => record.id
+      form.input :notes, as: :text, id: record.id
     end
 
-    group :sidebar, :holder => :sidebar do
-      field :sale_limit_id, :collection => lambda { SaleLimit.all }, :include_blank => false
+    group :sidebar, holder: :sidebar do
+      field :sale_limit_id, collection: lambda { SaleLimit.all }, include_blank: false
       field :sort_order
-      field :is_visible, :boolean => true
+      field :is_visible, boolean: true
     end
 
-    group :bottom, :holder => :bottom do
-      nested_attributes :variants, :multiply => true do
+    group :bottom, holder: :bottom do
+      nested_attributes :variants, multiply: true do
         field :size
-        field :total_stock, :html => { :style => 'width:100%;clear:both;' }
-        field :item_model_id, :collection => lambda { ItemModel.all }, :include_blank => false
+        field :total_stock, html: { style: 'width:100%;clear:both;' }
+        field :item_model_id, collection: lambda { ItemModel.all }, include_blank: false
       end
 
       nested_attributes :project_fields, multiply: true, sort: true do
         field :name
         field :value
       end
-    
-      field :picture, :as => :uploader
+
+      field :picture, as: :uploader
     end
   end
 
-  protected
+  private
 
-    def clear_cache
-      Rails.cache.clear
-    end
+  def clear_cache
+    Rails.cache.clear
+  end
 end
 ```
 
@@ -156,14 +164,14 @@ For more info look at jbuilder https://rubygems.org/gems/jbuilder.
 #### Excel
 
 ```
-  gem "ruby2xlsx", "~> 0.0.1"
+  gem "ruby2xlsx"
 
   GET /manage/users/export.xlsx
 ```
 
 ### Strong parameters
 
-Now in sunrise file you can perform attributes check. 
+Now in sunrise file you can perform attributes check.
 By default permited_attributes allow edit all attributes.
 
 ```ruby
@@ -171,11 +179,11 @@ class SunrisePost < Sunrise::AbstractModel
   self.resource_name = "Post"
   edit do
     # Default value
-    # permited_attributes :all 
+    # permited_attributes :all
 
     # Pre user check
-    permited_attributes lambda { |user| 
-      user.admin? ? :all : [:title, :content] 
+    permited_attributes lambda { |user|
+      user.admin? ? :all : [:title, :content]
     }
   end
 end
@@ -207,4 +215,4 @@ config.to_prepare do
 end
 ```
 
-Copyright (c) 2014 Fodojo, released under the MIT license
+Copyright (c) 2025 Fodojo, released under the MIT license

data/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link sunrise/application.css

data/app/assets/javascripts/sunrise/application.js

@@ -1,8 +1,6 @@
-//= require jquery
-//= require jquery_ujs
+//= require jquery-ui/widgets/sortable
+//= require jquery-ui/widgets/datepicker
 
-//= require jquery-ui/sortable
-//= require jquery-ui/datepicker
 //= require datepicker/jquery.ui.datepicker-uk
 //= require datepicker/jquery.ui.datepicker-ru
 

data/app/controllers/sunrise/manager_controller.rb

@@ -12,7 +12,7 @@ module Sunrise
     helper_method :abstract_model, :apply_scope, :scoped_index_path
 
     respond_to(*Sunrise::Config.navigational_formats)
-    respond_to :xml, :csv, :xlsx, only: %i[export]
+    respond_to :json, :csv, :xlsx, only: %i[export]
 
     def index
       @records = abstract_model.apply_scopes(params)
@@ -29,7 +29,7 @@ module Sunrise
     end
 
     def new
-      @record.assign_attributes(abstract_model.model_params)
+      @record.assign_attributes(abstract_model.permit_model_params)
 
       respond_with(@record) do |format|
         format.html { render_with_scope }
@@ -37,7 +37,7 @@ module Sunrise
     end
 
     def create
-      @record.update_attributes(model_params)
+      @record.update(model_params)
       respond_with(@record, location: redirect_after_update(@record))
     end
 
@@ -48,7 +48,7 @@ module Sunrise
     end
 
     def update
-      @record.update_attributes(model_params)
+      @record.update(model_params)
       respond_with(@record, location: redirect_after_update(@record))
     end
 
@@ -64,8 +64,6 @@ module Sunrise
         format.xml  { render xml: @records }
         format.json { render json: @records }
         format.csv  { render abstract_model.export_options.merge(csv: @records) }
-
-        format.xlsx { render abstract_model.export_options.merge(xlsx: @records) } if defined?(Mime::XLSX)
       end
     end
 

data/app/controllers/sunrise/settings_controller.rb

@@ -5,12 +5,11 @@ module Sunrise
     authorize_resource class: false
 
     def edit
-      @settings = Settings.get_all
-      respond_with(@settings)
+      @fields = Settings.defined_fields
     end
 
     def update
-      Settings.update_attributes(params[:settings])
+      Settings.update(params[:settings])
       redirect_to root_path
     end
   end

data/app/helpers/sunrise/structure_helper.rb

@@ -7,9 +7,9 @@ module Sunrise
 
       options = { parent_id: record.id, parent_type: 'Structure' }.merge(options)
 
-      case record.structure_type.kind
+      case record.structure_type.name
       when :page then edit_path(model_name: 'pages', id: record.id)
-      when :posts then index_path(options.merge(model_name: record.structure_type.kind))
+      when :posts then index_path(options.merge(model_name: record.structure_type.name))
       else edit_path(model_name: 'structures', id: record.id)
       end
     end

data/app/views/layouts/sunrise/application.html.erb

@@ -8,6 +8,8 @@
   <title><%= t('manage.page_title') %></title>
 
   <%= stylesheet_link_tag 'sunrise/application' %>
+	<%= javascript_include_tag 'https://code.jquery.com/jquery-3.7.1.slim.min.js', integrity: 'sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=', crossorigin: 'anonymous' %>
+	<%= javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/jquery-ujs/1.2.3/rails.min.js' %>
   <%= javascript_include_tag 'sunrise/application' %>
   <%#= javascript_include_tag ::Ckeditor.cdn_url %>
 </head>

data/app/views/sunrise/manager/_field.html.erb

@@ -6,14 +6,14 @@
     <% elsif field.nested? -%>
       <div class="nested">
         <div class="title-switcher up"><%= form.label field.name %></div>
-        
+
         <%= form.simple_fields_for field.name.to_sym do |nested| %>
-          <%= render :partial => "nested_field", :locals => { :form => nested, :field => field }  %>
+          <%= render partial: "nested_field", locals: { form: nested, field: field }  %>
         <% end -%>
-        
+
         <% if field.multiply? %>
           <div class="nested_bottom">
-            <%= manage_add_child_link t('manage.buttons.add_nested_field'), form, field, {:partial=>"nested_field"} %>
+            <%= manage_add_child_link t('manage.buttons.add_nested_field'), form, field, { partial: "nested_field" } %>
           </div>
         <% end -%>
 
@@ -28,7 +28,7 @@
     <% elsif field.association? -%>
       <%= form.association field.name.to_sym, field.input_options.merge(options) %>
     <% else -%>
-      <%= form.input field.name, field.input_options.merge(options)  %>
+      <%= form.input field.name, field.input_options.merge(options) %>
     <% end -%>
   <% end -%>
 <% end -%>

data/app/views/sunrise/manager/_form.html.erb

@@ -1,15 +1,15 @@
-<%= manage_form_for @record, :html => { :multipart => true } do |f| -%> 
-  <%= render :partial => 'sunrise/shared/parent' %>
+<%= manage_form_for @record, html: { multipart: true, id: 'resource-manage-form' } do |f| -%>
+  <%= render partial: 'sunrise/shared/parent' %>
 
   <div class="post-edit-holder">
-    <%= render :partial => "sunrise/shared/locale" if abstract_model.translate? %>
-    
+    <%= render partial: "sunrise/shared/locale" if abstract_model.translate? %>
+
 	  <div class="wysiwyg-holder">
-	    <%= render :partial => "sunrise/shared/available_locales", :locals => {:form => f} if abstract_model.translate? %>
-      
-      <%= render :partial => 'field', :collection => abstract_model.form_fields, :locals => {:form => f} %>
+	    <%= render partial: "sunrise/shared/available_locales", locals: {form: f} if abstract_model.translate? %>
+
+      <%= render partial: 'field', collection: abstract_model.form_fields, locals: {form: f} %>
 	  </div>
-	  
+
 	  <% if abstract_model.sidebar_groups? -%>
 	    <div class="post-properties-holder">
 	      <% abstract_model.sidebar_groups.each do |group| -%>
@@ -17,17 +17,17 @@
 		        <% if group.title != false -%>
   		        <div class="title-switcher up"><span><%= group.title %></span></div>
 		        <% end -%>
-		        
-		        <%= render :partial => 'field', :collection => group.fields, :locals => {:form => f} %>
+
+		        <%= render partial: 'field', collection: group.fields, locals: {form: f} %>
 	        </div>
 	      <% end -%>
-	    </div>  
+	    </div>
 	  <% end -%>
   </div>
-  
+
   <% abstract_model.bottom_groups.each do |group| -%>
-    <%= render :partial => 'field', :collection => group.fields, :locals => {:form => f} %>
+    <%= render partial: 'field', collection: group.fields, locals: {form: f} %>
   <% end -%>
-  
-  <%= f.button :submit, :style => "display:none;", :id => "submit-button-hidden" %>
+
+  <%= f.button :submit, style: "display:none;", id: "submit-button-hidden" %>
 <% end -%>

data/app/views/sunrise/manager/_header_edit.html.erb

@@ -1,11 +1,10 @@
 <div class="filter-line-wrapper">
   <div class="filter-line-holder">
 	  <div class="struct-name"><%= t('manage.edit')%></div>
-	
+
 	  <div class="vline-block">
-	    <%= submit_tag t('manage.update'), :class => 'button', :id => 'submit-form-button'  %>
-	    <%= submit_tag t('manage.cancel'), :class => 'button gray', :id => 'cancel-submit-form-button' %>
-		  <!--<input type="submit" value="Применить" class="button gray" />-->
+	    <%= submit_tag t('manage.update'), class: 'button', id: 'submit-form-button', form: 'resource-manage-form' %>
+	    <%= submit_tag t('manage.cancel'), class: 'button gray', id: 'cancel-submit-form-button' %>
 	  </div>
   </div>
 </div>

data/app/views/sunrise/manager/_header_new.html.erb

@@ -1,10 +1,10 @@
 <div class="filter-line-wrapper">
   <div class="filter-line-holder">
 	  <div class="struct-name"><%= t('manage.add')%></div>
-	
+
 	  <div class="vline-block">
-	    <%= submit_tag t('manage.create'), :class => 'button', :id => 'submit-form-button'  %>
-	    <%= submit_tag t('manage.cancel'), :class => 'button gray', :id => 'cancel-submit-form-button' %>
+	    <%= submit_tag t('manage.create'), class: 'button', id: 'submit-form-button', form: 'resource-manage-form' %>
+	    <%= submit_tag t('manage.cancel'), class: 'button gray', id: 'cancel-submit-form-button' %>
 	  </div>
   </div>
 </div>

data/app/views/sunrise/manager/_header_show.html.erb

@@ -3,10 +3,10 @@
     <div class="struct-name"><%= abstract_model.label %></div>
 
     <div class="vline-block">
-      <%= form_for search_wrapper, :url => scoped_index_path,  :html => { :method => :get, :novalidate => true } do |f| %>
-        <%= render :partial => 'sunrise/shared/parent' %>
+      <%= form_for search_wrapper, url: scoped_index_path,  html: { method: :get, novalidate: true } do |f| %>
+        <%= render partial: 'sunrise/shared/parent' %>
         <%= f.text_field :q %>
-        <%= f.submit t('manage.search'), :class => "button" %>
+        <%= f.submit t('manage.search'), class: "button" %>
       <% end %>
     </div>
   </div>
@@ -15,28 +15,24 @@
 <div class="top-line-holder">
   <div class="act-buttons-wrapper">
 
-    <% if can? :edit, @record, :context => :sunrise %>
+    <% if can? :edit, @record, context: :sunrise %>
       <div class="but-holder">
         <div class="act-but">
-          <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(:id => @record.id)), :class => 'but-container edit', :title => 'Edit' %>
+          <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(id: @record.id)), class: 'but-container edit', title: 'Edit' %>
         </div>
       </div>
     <% end -%>
 
-    <% if can? :delete, @record, :context => :sunrise %>
+    <% if can? :delete, @record, context: :sunrise %>
       <div class="but-holder">
         <div class="act-but">
-          <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(:id => @record.id)), 
-          :class => 'but-container del', 
-          :title => 'Delete', 
-          :method=>:delete,
-          :data => { :confirm => t('manage.confirm_delete') } %>
+          <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(id: @record.id)), class: 'but-container del', title: 'Delete', method: :delete, data: { confirm: t('manage.confirm_delete') } %>
         </div>
       </div>
     <% end %>
 
     <div class="buttons-holder">
-      <%= render :partial => apply_scope("controls"), :locals => {:record => @record} %>
+      <%= render partial: apply_scope("controls"), locals: { record: @record } %>
     </div>
   </div>
-</div>
+</div>

data/app/views/sunrise/manager/_nested_field.html.erb

@@ -1,10 +1,10 @@
 <div class="nested_item">
-  <%= manage_remove_child_link('', form, :class => "close-but") if field.multiply? %>
-  
+  <%= manage_remove_child_link('', form, class: "close-but") if field.multiply? %>
+
   <% if field.sort? %>
-    <%= image_tag 'sunrise/tree_dnd1.png', :class => "nested_input_handle" %>
-    <%= form.hidden_field field.sort_column, :class => "nested_input_sort" if field.sort_hidden_field? %>
+    <%= image_tag 'sunrise/tree_dnd1.png', class: "nested_input_handle" %>
+    <%= form.hidden_field field.sort_column, class: "nested_input_sort" if field.sort_hidden_field? %>
   <% end -%>
 
-  <%= render :partial => 'field', :collection => field.fields, :locals => {:form => form} %>
-</div>
+  <%= render partial: 'field', collection: field.fields, locals: { form: form } %>
+</div>

data/app/views/sunrise/manager/edit.html.erb

@@ -1,3 +1,3 @@
 <div class="wrapper without-panel">
-  <%= render :partial => 'form' %>
+  <%= render partial: 'form' %>
 </div>

data/app/views/sunrise/manager/new.html.erb

@@ -1,3 +1,3 @@
 <div class="wrapper without-panel">
-  <%= render :partial => 'form' %>
+  <%= render partial: 'form' %>
 </div>

data/app/views/sunrise/manager/structures/thumbs/_record.html.erb

@@ -1,15 +1,14 @@
-<%= content_tag(:div, :id => dom_id(record), :class => "main-item") do %>
+<%= content_tag(:div, id: dom_id(record), class: "main-item") do %>
   <div class="check-block"><input type="checkbox" /></div>
   <div class="img-block"> <%= image_tag 'sunrise/default_ava.png' %> </div>
   <div class="data-block">
     <div class="top-info-bl">
       <%= manage_date_tag(record.created_at)%>
-      <!--<a href="#" class="grey-but">Активировать</a>-->
     </div>
-    <%= link_to record.send(abstract_model.config.object_label_method), manage_structure_path(record), :class=>"item-title" %>
-    
+    <%= link_to record.send(abstract_model.config.object_label_method), manage_structure_path(record), class: "item-title" %>
+
 		<div class="bot-info-bl">
-		  
+
 		  <% abstract_model.list.fields.each do |field|%>
 			<div class="info-item">
 				<b><%= field.human_name %></b> <%= manage_render_field(field, record)%>
@@ -18,15 +17,19 @@
 
 		</div>
   </div>
-  <div class="but-block" style="display: none">
-    <div class="act-but">
-      <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(:id => record.id)), 
-          :method=>:delete, :data => {:confirm=>t("manage.confirm_delete")}, :class=>"but-container del", 
-          :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise) %>
-    </div>
-    
-    <div class="act-but">
-      <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(:id => record.id)), :class=>"but-container edit", :id => dom_id(record, :edit) if can?(:edit, record, :context => :sunrise) %>
-    </div>
+  <div class="but-block">
+    <% if can?(:delete, record, context: :sunrise) %>
+      <div class="act-but">
+        <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(id: record.id)),
+            method: :delete, data: {confirm: t("manage.confirm_delete")}, class: "but-container del",
+            id: dom_id(record, :delete) %>
+      </div>
+    <% end %>
+
+    <% if can?(:edit, record, context: :sunrise) %>
+      <div class="act-but">
+        <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(id: record.id)), class: "but-container edit", id: dom_id(record, :edit) %>
+      </div>
+    <% end %>
   </div>
-<% end -%>  
+<% end -%>

data/app/views/sunrise/manager/thumbs/_record.html.erb

@@ -1,18 +1,18 @@
-<%= content_tag(:div, :id => dom_id(record), :class => "main-item") do -%>
+<%= content_tag(:div, id: dom_id(record), class: "main-item") do -%>
   <div class="check-block">
-    <%= check_box_tag dom_id(record, :editable), record.id, false, :name => :editable %>
+    <%= check_box_tag dom_id(record, :editable), record.id, false, name: :editable %>
   </div>
-  <% if abstract_model.list.preview -%>  
+  <% if abstract_model.list.preview -%>
     <div class="img-block"><%= image_tag abstract_model.list.preview_for(record) %></div>
   <% end -%>
   <div class="data-block">
     <div class="top-info-bl">
       <%= manage_date_tag(record.created_at)%>
-      <%= render :partial => apply_scope("controls"), :locals => {:record => record} %>
+      <%= render partial: apply_scope("controls"), locals: {record: record} %>
     </div>
-    <%= link_to record.send(abstract_model.config.object_label_method), show_model_path(abstract_model, record), :class=>"item-title" %>
-    
-		<div class="bot-info-bl">  
+    <%= link_to record.send(abstract_model.config.object_label_method), show_model_path(abstract_model, record), clas:"item-title" %>
+
+		<div class="bot-info-bl">
 		  <% abstract_model.list.fields.each do |field| -%>
 			  <div class="info-item">
 			    <%= content_tag(:b, field.human_name) if field.label? %>
@@ -21,19 +21,23 @@
 			<% end -%>
 		</div>
   </div>
-  <div class="but-block" style="display: none">
-    <div class="act-but">
-      <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(:id => record.id)),
-          :method=>:delete, 
-          :data => {:confirm => t("manage.confirm_delete") }, 
-          :class=>"but-container del", 
-          :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise) %>
-    </div>
-    
-    <div class="act-but">
-      <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(:id => record.id)), 
-          :class=>"but-container edit", 
-          :id => dom_id(record, :edit) if can?(:edit, record, :context => :sunrise) %>
-    </div>
+  <div class="but-block">
+    <% if can?(:delete, record, context: :sunrise) %>
+      <div class="act-but">
+        <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(id: record.id)),
+            method: :delete,
+            data: {confirm: t("manage.confirm_delete") },
+            clas:"but-container del",
+            id: dom_id(record, :delete) %>
+      </div>
+    <% end %>
+
+    <% if can?(:edit, record, context: :sunrise) %>
+      <div class="act-but">
+        <%= link_to image_tag('sunrise/empty.gif'), edit_path(abstract_model.parent_hash.merge(id: record.id)),
+            clas:"but-container edit",
+            id: dom_id(record, :edit) %>
+      </div>
+    <% end %>
   </div>
-<% end -%>  
+<% end -%>

data/app/views/sunrise/settings/_form.html.erb

@@ -1,13 +1,13 @@
-<%= simple_form_for Settings, :url => settings_path, :html => {:method => :put} do |f| -%>
+<%= simple_form_for Settings.new, url: settings_path, html: {method: :put, id: 'resource-manage-form'} do |f| -%>
   <div class="post-edit-holder">
     <div class="wysiwyg-holder">
-      <% @settings.each do |key, value| -%>
+      <% @fields.each do |field| -%>
         <div class="padder">
-          <%= f.input key, :value => value, :required => false %>
+          <%= f.input field[:key], value: Settings[field[:key]], placeholder: field[:default], readonly: field[:readonly], as: field[:type] %>
         </div>
       <% end -%>
     </div>
   </div>
-  
-  <%= f.button :submit, :style => "display:none;", :id => "submit-button-hidden" %>
+
+  <%= f.button :submit, style: "display:none;", id: "submit-button-hidden" %>
 <% end -%>

data/app/views/sunrise/settings/_header_edit.html.erb

@@ -1,11 +1,10 @@
 <div class="filter-line-wrapper">
   <div class="filter-line-holder">
 	  <div class="struct-name"><%= t('manage.edit')%></div>
-	
+
 	  <div class="vline-block">
-	    <%= submit_tag t('manage.update'), :class => 'button', :id => 'submit-form-button'  %>
-	    <%= submit_tag t('manage.cancel'), :class => 'button gray', :id => 'cancel-submit-form-button' %>
-		  <!--<input type="submit" value="Применить" class="button gray" />-->
+	    <%= submit_tag t('manage.update'), class: 'button', id: 'submit-form-button', form: 'resource-manage-form' %>
+	    <%= submit_tag t('manage.cancel'), class: 'button gray', id: 'cancel-submit-form-button' %>
 	  </div>
   </div>
 </div>