scidea-schools 1.0.6 → 1.1

data/CHANGELOG

@@ -1,5 +1,5 @@
-1.0.6
-  - PHX-313: will not allow school to be destroyed if there are users associated with it
+1.1
+	- adds a Schools menu item to the admin UI primary nav
 
 1.0.4
   - override core styles for alert message on profile form so that messages stays within the form div

data/app/controllers/admin/schools_controller.rb

@@ -1,5 +1,5 @@
 module Admin
-  class SchoolsController < ApplicationController
+  class SchoolsController < AdminController
 
     ssl_exceptions
 

data/app/views/admin/schools/_school.html.erb

@@ -1,4 +1,4 @@
-<address> 
+ <div class="school-address">
   <%= school.name %><br />
   <%= school.address_1 %><br />
   <% if school.address_2 && !school.address_2.empty? %>
@@ -7,4 +7,5 @@
 
   <%= school.city %>, <%= school.state %> <%= school.zipcode %><br />
   <%= school.phone %>
-</address>
+ </div>
+

data/app/views/admin/schools/_search.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag form_url, :method => 'get', :id => "listview_search" do %>  
+<%= form_tag form_url, :method => 'get', :id => "listview_search", :role => 'search' do %>  
   <%= hidden_field_tag :direction, params[:direction] %>  
   <%= hidden_field_tag :sort, params[:sort] %>
   <%= hidden_field_tag :per_page, params[:per_page] %>  

data/app/views/admin/schools/index.html.erb

@@ -1,5 +1,5 @@
 <% css do %>
-  <%= theme_css 'pages/admin_index.css', :media => 'screen' %>
+  <%= theme_css 'layouts/index', :media => 'screen' %>
 <% end %>
 
 <% page_title 'Manage Educational Institutions' %>
@@ -48,7 +48,7 @@
         ]
       ],
       :actions_are_admin => true,
-      :css_class => 'table-blue-zebra',
+      :css_class => 'datatable',
       :sort_column => sort_column
     }
   ],

data/app/views/admin/schools/new_migration.html.erb

@@ -1,12 +1,12 @@
 <% css do %>
-  <%= theme_css 'pages/admin_index.css', :media => 'screen' %>
+  <%= theme_css 'layouts/index.css', :media => 'screen' %>
   <%= stylesheet_link_tag 'scidea/admin/pages/schools/user_migrate' %>
 <% end %>
 
 <% page_title 'Migrate Users between Educational Institutions' %>
 
 <div id="school-migration-message">
-  <p>You are migrating users from</p>
+  <p>You are migrating users from:</p>
   <%= render :partial => 'school', :locals => { :school => @school } %>
 </div>
 
@@ -64,7 +64,7 @@
           }
         ]
       ],
-      :css_class => 'table-blue-zebra',
+      :css_class => 'datatable',
       :sort_column => sort_column
     }
   ],

data/lib/generators/scidea/schools/templates/scidea_schools_02_remove_menu.rb

@@ -0,0 +1,22 @@
+class ScideaSchools02RemoveMenu < ActiveRecord::Migration
+
+  def up
+    execute "delete from menu_elements where display_name = 'Educational Institutions';"
+  end
+
+  def down
+
+    sql = <<-SQL
+      set @course_and_scitent_admins = (select group_concat(id) from roles where symbol in ('course_admin', 'scitent_admin'));
+      set @product_and_scitent_admins = (select group_concat(id) from roles where symbol in ('product_admin', 'scitent_admin'));
+
+      SELECT @admin_nav_secondary_id:=id FROM menus WHERE name = 'Admin Navigation: Secondary' LIMIT 1;
+
+      INSERT INTO menu_elements (display_name, menu_id, url, view_role_list, edit_role_list, order_sequence) VALUES ('Educational Institutions', @admin_nav_secondary_id, '/admin/schools', @course_and_scitent_admins, @product_and_scitent_admins, 102);
+    SQL
+
+    sql.split("\n").reject{|s| s.strip.start_with?('#') || s.strip.empty? }.each{ |s| execute s.strip }
+
+  end
+
+end

data/lib/scidea/schools/engine.rb

@@ -7,13 +7,22 @@ module Scidea
 
       initializer "scidea.schools.register_view_callbacks" do
         Scidea::Plugins::Plugin.on(:admin_user_form_after_profile)   { conditional_render('users/school_edit') }
-      
-        Scidea::Plugins::Plugin.on(:registration_new_after_profile)  { conditional_render('users/school_edit') }        
+
+        Scidea::Plugins::Plugin.on(:registration_new_after_profile)  { conditional_render('users/school_edit') }
         Scidea::Plugins::Plugin.on(:user_profile_form_after_profile)  { conditional_render('users/school_edit') }
 
         Scidea::Plugins::Plugin.on(:admin_user_profile_after_profile) { 'admin/users/profile_show_school' }
 
         Scidea::Plugins::Plugin.on(:user_profile_page_js) { 'backbone_apps/school_selector' }
+
+        Scidea::Plugins::Plugin.on(:admin_primary_navigation_users_menu_append) do |callback, menu|
+
+          menu.item :schools, 
+                   'Schools',
+                   callback.view_binding.eval('admin_schools_path')
+                   {}
+
+        end
       end
 
       config.to_prepare do

data/lib/scidea/schools/version.rb

@@ -1,5 +1,5 @@
 module Scidea
   module Schools
-    VERSION = "1.0.6"
+    VERSION = "1.1"
   end
 end

metadata

@@ -1,141 +1,156 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: scidea-schools
-version: !ruby/object:Gem::Version
-  version: 1.0.6
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  version: "1.1"
 platform: ruby
-authors:
+authors: 
 - Phoenix Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000Z
+
+date: 2012-01-16 00:00:00 -05:00
+default_executable: 
 dependencies: []
-description: Schools augments user's profiles with an associated school, along with
-  interfaces for adding new schools at runtime. Administrators can manage schools
-  and modify learner's schools.
-email:
+
+description: Schools augments user's profiles with an associated school, along with interfaces for adding new schools at runtime. Administrators can manage schools and modify learner's schools.
+email: 
 - phoenix@scitent.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- app/controllers/application_controller.rb
-- app/controllers/test/scidea_schools_qunit_tests_controller.rb
+
+files: 
+- app/assets/javascripts/backbone_apps/models/school.js
+- app/assets/javascripts/backbone_apps/school_selector.js
+- app/assets/stylesheets/scidea/admin/pages/schools/user_migrate.css
+- app/assets/stylesheets/scidea/pages/schools/user_profile.css
 - app/controllers/admin/schools_controller.rb
+- app/controllers/application_controller.rb
 - app/controllers/schools_controller.rb
+- app/controllers/test/scidea_schools_qunit_tests_controller.rb
 - app/helpers/schools_helper.rb
-- app/views/layouts/application.html.erb
-- app/views/users/_school_edit.html.erb
-- app/views/admin/users/_profile_show_school.html.erb
+- app/models/school.rb
+- app/themes/global_sass/_mixins.scss
+- app/themes/scidea/sass/_config.scss
+- app/themes/scidea/sass/admin/pages/schools/user_migrate.scss
+- app/themes/scidea/sass/components/_schools.scss
+- app/themes/scidea/sass/pages/schools/user_profile.scss
 - app/views/admin/schools/_form.html.erb
-- app/views/admin/schools/show.html.erb
+- app/views/admin/schools/_school.html.erb
 - app/views/admin/schools/_search.html.erb
 - app/views/admin/schools/confirm_migration.html.erb
-- app/views/admin/schools/new.html.erb
-- app/views/admin/schools/new_migration.html.erb
 - app/views/admin/schools/edit.html.erb
 - app/views/admin/schools/index.html.erb
-- app/views/admin/schools/_school.html.erb
+- app/views/admin/schools/new.html.erb
+- app/views/admin/schools/new_migration.html.erb
+- app/views/admin/schools/show.html.erb
+- app/views/admin/users/_profile_show_school.html.erb
+- app/views/layouts/application.html.erb
 - app/views/schools/_form.html.erb
+- app/views/schools/_profile_form.html.erb
 - app/views/schools/_script_form.html.erb
 - app/views/schools/_search.html.erb
-- app/views/schools/_profile_form.html.erb
-- app/themes/global_sass/_mixins.scss
-- app/themes/scidea/sass/components/_schools.scss
-- app/themes/scidea/sass/admin/pages/schools/user_migrate.scss
-- app/themes/scidea/sass/_config.scss
-- app/themes/scidea/sass/pages/schools/user_profile.scss
-- app/models/school.rb
-- app/assets/javascripts/backbone_apps/school_selector.js
-- app/assets/javascripts/backbone_apps/models/school.js
-- app/assets/stylesheets/scidea/admin/pages/schools/user_migrate.css
-- app/assets/stylesheets/scidea/pages/schools/user_profile.css
-- lib/scidea/schools.rb
+- app/views/users/_school_edit.html.erb
+- lib/generators/scidea/schools/migrations_generator.rb
+- lib/generators/scidea/schools/removal_migrations_generator.rb
+- lib/generators/scidea/schools/templates/removal/scidea_schools_99_remove.rb
+- lib/generators/scidea/schools/templates/scidea_schools_01_install.rb
+- lib/generators/scidea/schools/templates/scidea_schools_02_remove_menu.rb
 - lib/scidea/schools/engine.rb
-- lib/scidea/schools/models/profile.rb
 - lib/scidea/schools/models/ability.rb
+- lib/scidea/schools/models/profile.rb
 - lib/scidea/schools/version.rb
-- lib/tasks/db/seed.rake
+- lib/scidea/schools.rb
 - lib/scidea-schools.rb
-- lib/generators/scidea/schools/removal_migrations_generator.rb
-- lib/generators/scidea/schools/templates/removal/scidea_schools_99_remove.rb
-- lib/generators/scidea/schools/templates/scidea_schools_01_install.rb
-- lib/generators/scidea/schools/migrations_generator.rb
-- config/routes.rb
-- config/initializers/schools_assets.rb
-- config/environment.rb
+- lib/tasks/db/seed.rake
 - config/compass.rb
-- config/locales/en.yml
 - config/cucumber.yml
+- config/environment.rb
+- config/initializers/schools_assets.rb
+- config/locales/en.yml
 - config/requirejs.yml
+- config/routes.rb
 - db/seeds.rb
+- features/applying_for_seminars.feature
+- features/edit_seminar_application.feature
+- features/manage_users.feature
 - features/qunit/qunit.feature
-- features/step_definitions/qunit_steps.rb
-- features/step_definitions/seminar_steps.rb
-- features/step_definitions/user_steps.rb
+- features/schools/manage_schools.feature
+- features/schools/schools.feature
+- features/step_definitions/audience_steps.rb
 - features/step_definitions/authentication_steps.rb
-- features/step_definitions/misc_steps.rb
-- features/step_definitions/steps.rb
+- features/step_definitions/custom_form_steps.rb
+- features/step_definitions/email_steps.rb
 - features/step_definitions/menu_steps.rb
-- features/step_definitions/seminar_application_steps.rb
+- features/step_definitions/misc_steps.rb
+- features/step_definitions/qunit_steps.rb
 - features/step_definitions/registration_steps.rb
 - features/step_definitions/school_steps.rb
-- features/step_definitions/audience_steps.rb
-- features/step_definitions/email_steps.rb
+- features/step_definitions/seminar_application_steps.rb
+- features/step_definitions/seminar_steps.rb
+- features/step_definitions/steps.rb
+- features/step_definitions/user_steps.rb
 - features/step_definitions/web_steps.rb
-- features/step_definitions/custom_form_steps.rb
-- features/applying_for_seminars.feature
-- features/support/seed_user_roles.rb
 - features/support/env.rb
-- features/support/selectors.rb
-- features/support/paths.rb
 - features/support/hooks.rb
-- features/edit_seminar_application.feature
-- features/manage_users.feature
-- features/schools/manage_schools.feature
-- features/schools/schools.feature
+- features/support/paths.rb
+- features/support/seed_user_roles.rb
+- features/support/selectors.rb
 - qunit/helpers/qunit.js
-- qunit/tests/backbone_apps/school_selector.js
-- qunit/test_runner.html.erb
 - qunit/html_fixtures/backbone_apps/_school_selector.html.erb
+- qunit/test_runner.html.erb
+- qunit/tests/backbone_apps/school_selector.js
 - spec/controllers/admin/schools_controller_spec.rb
 - spec/controllers/schools_controller_spec.rb
-- spec/routing/admin/admin_schools_routing_spec.rb
-- spec/routing/schools_routing_spec.rb
 - spec/factories/menu_elements.rb
 - spec/factories/schools.rb
-- spec/support/controller_macros.rb
-- spec/models/school_spec.rb
-- spec/models/profile_spec.rb
 - spec/models/ability_spec.rb
+- spec/models/profile_spec.rb
+- spec/models/school_spec.rb
+- spec/routing/admin/admin_schools_routing_spec.rb
+- spec/routing/schools_routing_spec.rb
 - spec/spec_helper.rb
+- spec/support/controller_macros.rb
 - MIT-LICENSE
 - README.md
 - Rakefile
 - CHANGELOG
+has_rdoc: true
 homepage: https://github.com/phoenix-scitent/scidea-schools
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Schools extension for the Scitent Scidea platform
 test_files: []
+