faalis 1.0.0.alpha4 → 1.0.0

data/lib/faalis_plugin.rb

@@ -22,17 +22,17 @@ end
 gsub_file "#{app_name}.gemspec", /test\/\*\*\/\*/, "spec/**/*"
 
 insert_into_file "#{app_name}.gemspec", :after => 's.add_development_dependency "sqlite3"' do
-  "\n  s.add_dependency 'globalize', '>= 4.0.0.alpha.2'\n"
+  "\n  s.add_dependency 'globalize'"
 end
 
 insert_into_file "#{app_name}.gemspec", :after => 's.add_development_dependency "sqlite3"' do
-  "\n  s.add_dependency 'jbuilder', '~> 1.2'\n"
+  "\n  s.add_dependency 'jbuilder'"
 end
 insert_into_file "#{app_name}.gemspec", :after => 's.add_development_dependency "sqlite3"' do
-  "\n  s.add_dependency 'sass-rails', '~> 4.0.0'\n"
+  "\n  s.add_dependency 'sass-rails'"
 end
 insert_into_file "#{app_name}.gemspec", :after => 's.add_development_dependency "sqlite3"' do
-  "\n  s.add_dependency 'uglifier', '>= 1.3.0'\n"
+  "\n  s.add_dependency 'uglifier'"
 end
 insert_into_file "#{app_name}.gemspec", :after => 's.add_development_dependency "sqlite3"' do
   "\n  s.add_dependency 'jquery-rails'\n"
@@ -42,6 +42,7 @@ insert_into_file "#{app_name}.gemspec", :after => 's.add_development_dependency
 end
 
 inside "app/assets/javascripts/" do
+  run "mkdir #{app_name.underscore.downcase}"
   run "touch #{app_name.underscore.downcase}/application.js"
 end
 append_file "app/assets/javascripts/#{app_name.underscore.downcase}/application.js" do <<-'FILE'

data/lib/generators/faalis/install_generator.rb

@@ -41,6 +41,7 @@ module Faalis
         template 'formtastic.rb', 'config/initializers/formstatic.rb'
         template 'seeds.rb', 'db/seeds.rb'
         template 'api_controller.rb', 'app/controllers/api_controller.rb'
+        template 'policy/application_policy.rb', 'app/policies/application_policy.rb'
       end
 
       def copy_js_manifest

data/lib/generators/faalis/js/list_view_generator.rb

@@ -48,6 +48,10 @@ module Faalis
           end
         end
 
+        def create_policy
+          template "policy/policy.rb.erb", "app/policies/#{resource.underscore}_policy.rb"
+        end
+
         def create_specs
           unless options[:without_specs]
             template "features/api.feature", "features/#{resource.underscore}.api.feature"

data/lib/generators/faalis/scaffold_generator.rb

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 #    Faalis - Basic website skel engine
-#    Copyright (C) 2012-2014 Yellowen
+#    Copyright (C) 2012-2015 Yellowen
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -54,13 +54,11 @@ module Faalis
       private
 
       # Create a dedicated controller,
-      # It does not have any relation to Faalis
-      # TODO: Check for better way
       def create_controller
         if options[:no_asset]
-          `rails g scaffold_controller #{resource_data["name"]} --skip`
+          `rails g scaffold_controller #{resource_data["name"]} #{all_fields}--assets=false`
         else
-          `rails g scaffold_controller #{resource_data["name"]}`
+          `rails g scaffold_controller #{resource_data["name"]} #{all_fields}`
         end
       end
 
@@ -69,44 +67,94 @@ module Faalis
         route "resources :#{resource_data["name"].pluralize}"
       end
 
-      #Create model of the scaffold with belongs_to support
-      #It does not support has_many relation yet
+      # Create model of the scaffold with belongs_to support
+      # It does not support has_many relation yet
       def create_model
-        result = []
-        all_fields = []
+
+        # Load all globalize field and create a string to adding in model
+        globalizes = "\n  translates "+
+          globalize_fields.map { |field | ":#{field['name'].underscore}" }.join(", ")
+        invoke('active_record:model', [resource_data['name'].singularize.underscore, all_fields.split(' ')], {
+                 migration: !options[:no_migragtion], timestamps: true
+               })
+        if globalize_fields.any?
+          create_globalize_migration
+        end
+
+        if File.exist?("app/models/#{resource_data["name"]}.rb")
+          inject_into_file "app/models/#{resource_data["name"].underscore}.rb", after: 'Base' do
+            globalize_fields.empty? ? relations : relations + globalizes
+          end
+        else
+          say_status "error", "Could not find file app/models/#{resource_data["name"].underscore}"
+        end
+
+      end
+
+      #Invoke Faalis list view generator
+      def create_list_view
+          invoke 'faalis:js:list_view', [input_file]
+      end
+
+      def create_globalize_migration
+        `rails g migration add_globalize_to_#{resource_data["name"].underscore} `
+        Dir["#{Rails.root}/db/migrate/**/*globalize*.rb"].each {|file| require file }
+        klass = "add_globalize_to_#{resource_data['name']}".underscore.camelize
+
+        migration_class = "::#{klass}".constantize
+        migration_path = migration_class.instance_method(:change).source_location
+
+        fields = globalize_fields.map { |field | ":#{field['name']} => :#{field['type']}" }.join(", ")
+
+        inject_into_file migration_path[0], after: 'change' do
+          "\n    #{resource_data['name'].camelize}"+
+            '.create_translation_table! '+
+            fields
+        end
+      end
+
+      def create_images
+        fields.each do |name, type|
+          if type == 'image'
+            generate "paperclicp #{resource_data['name']} #{name}"
+          end
+        end
+      end
+
+      def create_tags
+        fields.each do |name, type|
+          if type == 'image'
+            rake "rake acts_as_taggable_on_engine:install:migrations"
+          end
+        end
+      end
+
+      # Create string of all relations that needs in models
+      def relations
         relations = "\n"
+
         fields.each do |name, type, to|
           case type
           when 'belongs_to'
-            type_ = 'integer'
             if to.singularize != name
               relations << "  belongs_to :#{name.singularize},
               :class_name => \"#{to.singularize.camelize}\"\n"
             else
               relations << "  belongs_to :#{to.singularize}\n"
             end
-            name_ = "#{name.singularize}_id"
-            result << [name_, type_]
-
-          when 'text', 'integer', 'string', 'boolean', 'datetime', 'time', 'date', 'float'
-            result << [name, type]
 
           when 'image'
-            generate "paperclicp #{resource_data['name']} #{name}"
-            relations << "  has_attached_file :#{name}\n"
-            relations << "  validates_attachment_content_type :#{name},
+            relations << "
+     attr_accessor :image_data\n
+     before_create :randomize_file_name\n
+     has_attached_file :#{name}\n
      content_type: %w(image/jpeg image/jpg image/png),
-     less_than:  1.megabytes\n"
-            # TODO: Run this generator just once for all images
-            `rails generate paperclip #{resource_data['name']} #{name}`
-
+     validates_attachment_content_type :#{name},
+     less_than:  1.megabytes\n
+"
+            # TODO: randomize_file_name method should be added
           when 'tag'
-            rake "rake acts_as_taggable_on_engine:install:migrations"
             relations << "  acts_as_taggable_on :#{name}\n"
-            result << [name, 'string']
-
-          when 'in'
-            result << [name, 'string']
 
           when 'has_and_belongs_to_many'
             relations << "  has_and_belongs_to_many :#{to.pluralize}\n"
@@ -122,67 +170,45 @@ module Faalis
 
         if parent?
           parents.each do |parent|
-            result << ["#{parent.singularize}_id", "integer"]
             relations << "  belongs_to :#{parent.singularize}\n"
           end
         end
 
-
         childs.each do |child|
           relations << "  has_many :#{child.pluralize}\n"
         end
+        return relations
+      end
 
-        all_fields = result.collect do |x|
-          x.join(':')
-        end
-
-        # Load all globalize field and create a string to adding in model
-        globalizes = "\n  translates "+
-          globalize_fields.map { |field | ":#{field['name'].underscore}" }.join(", ")
-
+      # It will extract name and types of all fields
+      # And will return it as supported format for scaffold_controller
+      def all_fields
+        result = []
+        fields.each do |name, type, to|
+          case type
+          when 'belongs_to'
+            name_ = "#{name.singularize}_id"
+            result << [name_, 'integer']
 
+          when 'text', 'integer', 'string', 'boolean', 'datetime', 'time', 'date', 'float'
+            result << [name, type]
 
-        invoke('active_record:model', [resource_data['name'].underscore, *all_fields], {
-                 migration: !options[:no_migration], timestamps: true
-               })
-        if globalize_fields.any?
-          create_globalize_migration
+          when 'tag', 'in'
+            result << [name, 'string']
+          end
         end
 
-        if File.exist?("app/models/#{resource_data["name"]}.rb")
-
-          inject_into_file "app/models/#{resource_data["name"].underscore}.rb", after: 'Base' do
-
-            globalize_fields.empty? ? relations : relations + globalizes
+        if parent?
+          parents.each do |parent|
+            result << ["#{parent.singularize}_id", "integer"]
           end
-        else
-          puts "Could not find file app/models/#{resource_data["name"].underscore}"
         end
 
-
-
-      end
-
-      #Invoke Faalis list view generator
-      def create_list_view
-          invoke 'faalis:js:list_view', [input_file]
-      end
-
-      def create_globalize_migration
-        `rails g migration add_globalize_to_#{resource_data["name"].underscore} `
-        Dir["#{Rails.root}/db/migrate/**/*globalize*.rb"].each {|file| require file }
-        klass = "add_globalize_to_#{resource_data['name']}".underscore.camelize
-
-        migration_class = "::#{klass}".constantize
-        migration_path = migration_class.instance_method(:change).source_location
-
-        fields = globalize_fields.map { |field | ":#{field['name']} => :#{field['type']}" }.join(", ")
-
-        inject_into_file migration_path[0], after: 'change' do
-          "\n    #{resource_data['name'].camelize}"+
-            '.create_translation_table! '+
-            fields
+        all_fields = []
+        all_fields = result.collect do |x|
+          x.join(':')
         end
+        return all_fields.join " "
       end
     end
   end

data/lib/generators/faalis/templates/angularjs/new.html.erb

@@ -14,15 +14,15 @@
 
     <% first = true %><% fields.each do |field_name, field_type| %>
     <% if first %><div class="row"><% end %>
-      <div class="small-4 columns <% if not first %>float-left small-offset-2<% end %>">
+      <div class="col-sm-4 <% if not first %>pull-left col-sm-offset-2<% end %>">
         <label><% if required_fields.include? field_name %><i class="inline fa fa-asterisk"></i> <% end %><span translate><%= field_name.to_s.humanize.capitalize %></span> :</label><% case field_type
          when "belongs_to", "has_many", "in" %>
         <relation-field select2-options="select2options" <% if required_fields.include? field_name %>required="true"<% end %> title-field="'name'" model="<%= field_name %>" field-data="<%= field_name %>_data">
         </relation-field>
         <% when nil %>
-        <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
+        <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'form-control rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
         <% else %>
-        <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
+        <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'form-control rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
       </div>
     <% if not first %></div><% end %><% first = !first %><% end %>
   </fieldset>
@@ -36,15 +36,15 @@
       <% fields.each do |field_name, field_type| %><% if tabs[name].include? field_name or tabs[name].include? "__all__" %>
 
       <% if first %><div class="row"><% end %>
-        <div class="small-4 columns <% if not first %>float-left small-offset-2<% end %>">
+        <div class="col-sm-4 form-group <% if not first %>pull-left col-sm-offset-2<% end %>">
           <label><% if required_fields.include? field_name %><i class="inline fa fa-asterisk"></i> <% end %><span translate><%= field_name.to_s.humanize.capitalize %></span> :</label><% case field_type
            when "belongs_to", "has_many", "in" %>
           <relation-field select2-options="select2options" <% if required_fields.include? field_name %>required="true"<% end %> title-field="'name'" model="<%= field_name %>" field-data="<%= field_name %>_data">
           </relation-field>
           <% when nil %>
-          <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
+          <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'form-control rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
           <% else %>
-          <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
+          <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'form-control rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
         </div>
       <% if not first %></div><% end %><% first = !first %><% end %><% end %>
     </fieldset>
@@ -53,10 +53,10 @@
 <% end %>
 
   <div class="row">
-      <div class="small-6 columns">
-        <button class="btn small green" ng-click="save(false)" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Save</span></button>
-        <button class="btn small blue" ng-click="save(true)" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Save & Add Another</span></button>
-        <button class="btn small red" ng-click="cancel()"><i class="fa fa-times"></i> <span translate>Cancel</span></button>
+      <div class="col-sm-4 form-group">
+        <button class="btn btn-success" ng-click="save(false)" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Save</span></button>
+        <button class="btn btn-warning" ng-click="save(true)" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Save & Add Another</span></button>
+        <button class="btn btn-danger" ng-click="cancel()"><i class="fa fa-times"></i> <span translate>Cancel</span></button>
       </div>
   </div>
 </div>

data/lib/generators/faalis/templates/js/list_view/new.html.erb

@@ -15,15 +15,15 @@
 
     <% first = true %><% fields.each do |field_name, field_type| %>
     <% if first %><div class="row"><% end %>
-      <div class="small-4 columns <% if not first %>float-left small-offset-2<% end %>">
+      <div class="col-sm-4 form-group <% if not first %>pull-left col-sm-offset-2<% end %>">
         <label><% if required_fields.include? field_name %><i class="inline fa fa-asterisk"></i> <% end %><span translate><%= attrs(field_name, 'title') || field_name.to_s.humanize.capitalize %></span> :</label><% case field_type
          when "belongs_to", "has_many", "in" %>
         <relation-field select2-options="select2options" <% if required_fields.include? field_name %>required="true"<% end %> title-field="'name'" model="<%= field_name %>" field-data="<%= field_name %>_data">
         </relation-field>
         <% when nil %>
-        <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
+        <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'form-controll rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
         <% else %>
-        <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
+        <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'form-controll rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
       </div>
     <% if not first %></div><% end %><% first = !first %><% end %>
   </fieldset>
@@ -38,15 +38,15 @@
       <% fields.each do |field_name, field_type| %><% if tab_has_field?(name, field_name) or tabs[name].include? "__all__" %>
 
       <% if first %><div class="row"><% end %>
-        <div class="small-4 columns <% if not first %>float-left small-offset-2<% end %>">
+        <div class="col-sm-4 form-group <% if not first %>pull-left col-sm-offset-2<% end %>">
           <label><% if required_fields.include? field_name %><i class="inline fa fa-asterisk"></i> <% end %><span translate><%= attrs(field_name, 'title') || field_name.to_s.humanize.capitalize %></span> :</label><% case field_type
            when "belongs_to", "has_many", "in" %>
           <relation-field select2-options="select2options" <% if required_fields.include? field_name %>required="true"<% end %> title-field="'name'" model="<%= field_name %>" field-data="<%= field_name %>_data">
           </relation-field>
           <% when nil %>
-          <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
+          <string-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'form-controll rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required<% end %>></string-field>
           <% else %>
-          <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
+          <<%= field_type%>-field model="<%= field_name %>" field-name="'<%= field_name %>'" css-class="'form-controll rounded <%= field_type %>_field'" <% if required_fields.include? field_name %>required="true"<% end %>></<%= field_type%>-field><% end %>
         </div>
       <% if not first %></div><% end %><% first = !first %><% end %><% end %>
     </fieldset>
@@ -55,10 +55,10 @@
 <% end %>
 
   <div class="row">
-      <div class="small-6 columns">
-        <button class="btn small green" ng-click="save(false)" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Save</span></button>
-        <button class="btn small blue" ng-click="save(true)" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Save & Add Another</span></button>
-        <button class="btn small red" ng-click="cancel()"><i class="fa fa-times"></i> <span translate>Cancel</span></button>
+      <div class="col-sm-6 form-group">
+        <button class="btn btn-success" ng-click="save(false)" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Save</span></button>
+        <button class="btn btn-warning" ng-click="save(true)" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Save & Add Another</span></button>
+        <button class="btn btn-danger" ng-click="cancel()"><i class="fa fa-times"></i> <span translate>Cancel</span></button>
       </div>
   </div>
 </div>

data/lib/generators/faalis/templates/js/list_view/partials/add_controller.js.erb

@@ -1,7 +1,7 @@
-<%= resource.pluralize %>.controller("Add<%= resource %>Controller", ["Restangular", "$scope", "$location", "$routeParams", "gettext", "catch_error", function(API, $scope, $location, $routeParams, gettext, catch_error){
+<%= resource.pluralize %>.controller("Add<%= resource %>Controller", ["Restangular", "$scope", "$location", "$stateParams", "gettext", "catch_error", function(API, $scope, $location, $stateParams, gettext, catch_error){
 
     <% parents.each do |parent| %>
-   $scope.<%= parent %>_id = $routeParams.<%= parent %>_id;
+   $scope.<%= parent %>_id = $stateParams.<%= parent %>_id;
     <% end %>
 
     $scope.select2options = {};
@@ -24,8 +24,8 @@
     <% fields.each do |name, type, to| %><% if type == "in" %>$scope.<%= name %>_choices = [<% to.each do |choice| %>
         {name: "<%= choice.underscore %>", title: "<%= choice.humanize %>"},<% end %>
     ].sortBy(), "title");<% end %><% end %>
-    if( "id" in $routeParams ){
-        $scope.obj_id = $routeParams.id;
+    if( "id" in $stateParams ){
+        $scope.obj_id = $stateParams.id;
         $scope.editing = true;
         if ($scope.obj_id < 0) {
             is_copy = true;

data/lib/generators/faalis/templates/js/list_view/partials/config.js.erb

@@ -1,17 +1,20 @@
 // <%= resource.pluralize %> configuration section ---------------------------
-<%= resource.pluralize %>.config(["$routeProvider", function($routeProvider){
+<%= resource.pluralize %>.config(["$stateProvider", function($stateProvider){
     // Add any route you need here
-    $routeProvider.
-        when("<% parents.each do |parent| %>/<%= parent %>/:<%= parent %>_id<% end %>/<%= resource_url %>", {
-            templateUrl: template("<%= resource_path %>/index"),
+    $stateProvider.
+        state("<% parents.each do |parent| %><%= parent %>-<% end %><%= resource_url %>", {
+            url: "/<%= resource_url %>",
+            templateUrl: template_url("<%= resource_path %>/index"),
             controller: "<%= resource %>Controller"
         }).
-        when("<% parents.each do |parent| %>/<%= parent %>/:<%= parent %>_id<% end %>/<%= resource_url %>/new",{
-            templateUrl: template("<%= resource_path %>/new"),
+        state("<% parents.each do |parent| %><%= parent %>-<% end %><%= resource_url %>/new",{
+            url: "/<%= resource_url %>/new",
+            templateUrl: template_url("<%= resource_path %>/new"),
             controller: "Add<%= resource %>Controller"
         }).
-        when("<% parents.each do |parent| %>/<%= parent %>/:<%= parent %>_id<% end %>/<%= resource_url %>/:id/edit",{
-            templateUrl: template("<%= resource_path %>/new"),
+        state("<% parents.each do |parent| %><%= parent %>-<% end %><%= resource_url %>-edit",{
+            url: "/<%= resource_url %>/:id/edit",
+            templateUrl: template_url("<%= resource_path %>/new"),
             controller: "Add<%= resource %>Controller"
         });
 }]);

data/lib/generators/faalis/templates/js/list_view/partials/index_controller.js.erb

@@ -1,9 +1,9 @@
 // <%= resource %> index controller -------------------------------------------------------
 // This controller is responsible for list page (index)
-<%= resource.pluralize %>.controller("<%= resource %>Controller", ["$scope", "gettext", "Restangular", "catch_error", "$location", "$routeParams", function($scope, gettext, API, catch_error, $location, $routeParams){
+<%= resource.pluralize %>.controller("<%= resource %>Controller", ["$scope", "gettext", "Restangular", "catch_error", "$location", "$stateParams", function($scope, gettext, API, catch_error, $location, $stateParams){
 
     <% parents.each do |parent| %>
-    $scope.<%= parent %>_id = $routeParams.<%= parent %>_id;
+    $scope.<%= parent %>_id = $stateParams.<%= parent %>_id;
     <% end %>
     <% unless no_filter? %>$scope.filter_config = {
         list: <% if parent? %>API.<% parents.each do |parent| %>one("<%= parent %>", $scope.<%= parent %>_id)<% end %>.all("<%= resource.pluralize.underscore %>")<% else %>API.all("<%= resource.pluralize.underscore %>")<% end %>
@@ -48,7 +48,7 @@
         {
             title: gettext("New"),
             icon: "fa fa-plus",
-            classes: "btn tiny green",
+            classes: "btn btn-success",
             permission: {
               name: "create",
               model: "<% if model_specified? %><%= model %><% else %><%= resource.classify %><% end %>"
@@ -59,7 +59,7 @@
         {
             title: gettext("Bulk Edit"),
             icon: "fa fa-edit",
-            classes: "btn tiny yellow",
+            classes: "btn btn-warning",
             permission: {
               name: "update",
               model: "<% if model_specified? %><%= model %><% else %><%= resource.classify %><% end %>"
@@ -72,7 +72,7 @@
         {
             title: gettext("Duplicate"),
             icon: "fa fa-files-o",
-            classes: "btn tiny red",
+            classes: "btn btn-danger",
             permission: {
               name: "create",
               model: "<% if model_specified? %><%= model %><% else %><%= resource.classify %><% end %>"