fullstack-admin 0.1.15 → 0.1.16

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/app/assets/javascripts/support/forms.js.coffee

@@ -7,11 +7,13 @@
 #= require support/pickers
 #= require chosen-jquery
 #= require ajax-chosen
-#= require jquery.form
 #= require jquery.remotipart
 #= require jquery.validate
 #= require ckeditor/init
 
+## require jquery.form
+
+
 $(document).ready ->
 
   $("input[data-limit],textarea[data-limit]").limit()

data/fullstack-admin.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
@@ -994,8 +994,8 @@ Gem::Specification.new do |s|
     "lib/generators/fullstack/admin/templates/root/app/assets/stylesheets/admin/admin.css",
     "lib/generators/fullstack/admin/templates/root/app/controllers/admin/dashboard_controller.rb",
     "lib/generators/fullstack/admin/templates/root/app/models/user.rb",
-    "lib/generators/fullstack/admin/templates/root/app/views/admin/_nav.html.erb",
     "lib/generators/fullstack/admin/templates/root/app/views/admin/dashboard/show.html.erb",
+    "lib/generators/fullstack/admin/templates/root/app/views/admin/shared/_nav.html.erb",
     "lib/generators/fullstack/admin/templates/root/db/migrate/%migration_timestamp%_create_ckeditor_assets.rb",
     "lib/generators/fullstack/admin/templates/root/lib/support/user_subject.rb",
     "locales/en.yml",

data/lib/generators/fullstack/admin/scaffold_generator.rb

@@ -45,10 +45,11 @@ module Fullstack
       # end
       
       def append_to_menu
-        gsub_file(Rails.root.join('app', 'views', scope, "shared", "_nav.html.erb"), /\<\!-- items placeholder --\>\n/) do
+        placeholder_text = "FULLSTACK_PLACEHOLDER"
+        gsub_file(Rails.root.join('app', 'views', scope, "shared", "_nav.html.erb"), /\<\!-- #{placeholder_text} --\>\n/) do
 <<-str
       <%= nav_item _("#{controller_class_name}"), #{scope}_#{plural_name}_path %>
-      <!-- items placeholder -->
+      <!-- #{placeholder_text} -->
           
 str
         end

data/lib/generators/fullstack/admin/templates/root/app/assets/javascripts/admin/admin.js.coffee

@@ -5,7 +5,5 @@
 #= require support/uploads
 #= require support/plupload
 #= require support/facebox
-#= require admin/links
-#= require ckeditor/init
 
 # require support/gmap

data/lib/generators/fullstack/admin/templates/root/app/views/admin/shared/_nav.html.erb

@@ -0,0 +1,30 @@
+<% content_for :menu do -%>
+  
+  <%= nav do %>
+  <%= nav_item t('fullstack.admin.dashboard', :default => "Dashboard"), admin_root_path, :icon => "cog" , :icon_color => :white %>
+  <% end %>
+  
+  <%= nav(:class => 'float right') do %>
+  <%= nav_item t('fullstack.admin.homepage', :default => "Homepage"), "/", :icon => "home" , :icon_color => :white %>
+    <%= dropdown_nav_item t('fullstack.admin.account', :default => "Account"), :icon => "user" , :icon_color => :white do %>
+        <%= nav_item t('fullstack.admin.logout', :default => "Logout"), destroy_user_session_path, :method => :delete %>
+    <% end %>
+  <% end %>
+  
+<% end -%>
+
+<% content_for :nav do -%>
+  
+  <div class="well">
+    <%= nav_list do %>
+      <!-- FULLSTACK_PLACEHOLDER -->
+    
+      <!-- Please do not delete the comment above. 
+           It is used by fullstack generators
+           to attach new items to this menu.
+        -->
+    <% end %>
+  </div>
+
+
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
   prerelease: 
 platform: ruby
 authors:
@@ -1220,8 +1220,8 @@ files:
 - lib/generators/fullstack/admin/templates/root/app/assets/stylesheets/admin/admin.css
 - lib/generators/fullstack/admin/templates/root/app/controllers/admin/dashboard_controller.rb
 - lib/generators/fullstack/admin/templates/root/app/models/user.rb
-- lib/generators/fullstack/admin/templates/root/app/views/admin/_nav.html.erb
 - lib/generators/fullstack/admin/templates/root/app/views/admin/dashboard/show.html.erb
+- lib/generators/fullstack/admin/templates/root/app/views/admin/shared/_nav.html.erb
 - lib/generators/fullstack/admin/templates/root/db/migrate/%migration_timestamp%_create_ckeditor_assets.rb
 - lib/generators/fullstack/admin/templates/root/lib/support/user_subject.rb
 - locales/en.yml
@@ -1262,7 +1262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2859614402237606499
+      hash: 2167604750692856345
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/generators/fullstack/admin/templates/root/app/views/admin/_nav.html.erb

@@ -1,34 +0,0 @@
-<% content_for :menu do -%>
-  
-  <%= nav do %>
-  <%= nav_item _("Dashboard"), admin_root_path, :icon => "cog" , :icon_color => :white %>
-  <% end %>
-  
-  <%= nav(:class => 'float right') do %>
-  <%= nav_item _("Homepage"), "/", :icon => "home" , :icon_color => :white %>
-    <%= dropdown_nav_item _("Account"), :icon => "user" , :icon_color => :white do %>
-        <%= nav_item _('Logout'), destroy_user_session_path, :method => :delete %>
-    <% end %>
-  <% end %>
-  
-<% end -%>
-
-<% content_for :nav do -%>
-  
-  <div class="well">
-    <%= nav_list do %>
-      <%= nav_header _("Contents") %>    
-      <!-- FULLSTACK_PLACEHOLDER -->
-    
-      <!-- Please do not delete the comment above. 
-           It is a placeholder used by fullstack generators
-           to attach new menu items
-        -->
-      
-      <%= nav_header _("Users") %>
-      <%= nav_item _("Users"), admin_users_path %>
-    <% end -%>
-  </div>
-
-
-<% end -%>