kuhsaft 1.0.3 → 1.1.0

data/README.md

@@ -60,6 +60,19 @@ Load the Kuhsaft assets into your app, so you have working grids, widgets etc:
     # application.js.coffee
     //= require 'kuhsaft/application'
 
+## Authentication
+
+Kuhsaft itself does not ship with any form of authentication. However, it is fairly easy to add by plugging into the Kuhsaft::Cms::AdminController. An example with devise:
+
+```ruby
+# config/initializers/kuhsaft.rb
+Kuhsaft::Cms::AdminController.class_eval do
+  before_filter :authenticate_user!
+end
+```
+
+Also, be sure to have override the navigation partial in `app/views/kuhsaft/cms/admin/_main_navigation.html.haml` so you get a working logout button.
+
 ## Modifying the backend CSS
 Simply override the custom css in your app with your own style at `assets/stylesheets/kuhsaft/cms/customizations.css.sass`
 

data/app/controllers/kuhsaft/cms/admin_controller.rb

@@ -4,7 +4,6 @@ module Kuhsaft
       respond_to :html
       layout 'kuhsaft/cms/application'
       before_filter :set_content_locale
-      before_filter :authenticate_cms_admin!
 
       def set_content_locale
         if params[:content_locale].present?

data/app/views/kuhsaft/cms/admin/_main_navigation.html.haml

@@ -1,6 +1,6 @@
 = link_to 'Kuhsaft CMS', '#', :class => 'brand'
 %p.navbar-text.pull-right
-  = link_to t('.logout'), kuhsaft.destroy_cms_admin_session_path, :method => :delete
+  = link_to t('.logout'), '', :method => :delete
 %ul.nav
   %li
     = link_to Kuhsaft::Page.model_name.human(:count => 2), kuhsaft.cms_pages_path

data/config/routes.rb

@@ -1,7 +1,5 @@
 Kuhsaft::Engine.routes.draw do
   namespace :cms do
-    devise_for :admins, :class_name => "Kuhsaft::Cms::Admin",
-                        :module => :devise
     resources :pages, :except => :show
     resources :bricks, :except => [:new, :edit, :index]
     resources :assets

data/db/migrate/20130206141601_remove_cms_admin.rb

@@ -0,0 +1,9 @@
+class RemoveCmsAdmin < ActiveRecord::Migration
+  def change
+    begin
+      remove_table :kuhsaft_cms_admins
+    rescue
+      puts 'kuhsaft_cms_admins table does not exist, not deleting'
+    end
+  end
+end

data/lib/kuhsaft.rb

@@ -1,4 +1,5 @@
-require "kuhsaft/engine"
+require 'kuhsaft/engine'
+require 'compass-rails'
 
 module Kuhsaft
   require 'kuhsaft/engine'
@@ -11,6 +12,5 @@ module Kuhsaft
   require 'rdiscount'
   require 'compass'
   require 'ancestry'
-  require 'devise'
   require 'bootstrap-sass'
 end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/spec/features/cms_pages_spec.rb

@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 describe 'Cms/Pages' do
-  sign_in_cms_admin
 
   context '#new' do
     before do

data/spec/spec_helper.rb

@@ -32,7 +32,6 @@ RSpec.configure do |config|
   config.include CarrierWave::Test::Matchers
   config.include KuhsaftSpecHelper
   config.include FactoryGirl::Syntax::Methods
-  config.extend RequestMacros
 
   config.before :suite do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -174,13 +174,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.11.1
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: compass-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -188,15 +188,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -204,15 +204,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -220,15 +220,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -236,15 +236,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -252,7 +252,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -313,7 +313,6 @@ files:
 - app/models/kuhsaft/asset.rb
 - app/models/kuhsaft/brick.rb
 - app/models/kuhsaft/brick_type.rb
-- app/models/kuhsaft/cms/admin.rb
 - app/models/kuhsaft/cms.rb
 - app/models/kuhsaft/column_brick.rb
 - app/models/kuhsaft/image_brick.rb
@@ -373,7 +372,6 @@ files:
 - app/views/kuhsaft/video_bricks/_video_brick.html.haml
 - app/views/kuhsaft/video_bricks/video_brick/_edit.html.haml
 - app/views/layouts/kuhsaft/cms/application.html.haml
-- config/initializers/devise.rb
 - config/initializers/simple_form.rb
 - config/initializers/simple_form_bootstrap.rb
 - config/locales/kuhsaft.de.yml
@@ -402,8 +400,8 @@ files:
 - db/migrate/02_create_kuhsaft_bricks.rb
 - db/migrate/03_create_kuhsaft_brick_types.rb
 - db/migrate/04_create_kuhsaft_assets.rb
-- db/migrate/05_create_kuhsaft_cms_admins.rb
 - db/migrate/06_add_template_name_to_kuhsaft_bricks.rb
+- db/migrate/20130206141601_remove_cms_admin.rb
 - db/seeds.rb
 - lib/generators/kuhsaft/translations/add_generator.rb
 - lib/kuhsaft/brick_list.rb
@@ -452,7 +450,6 @@ files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb
-- spec/features/cms_auth_spec.rb
 - spec/features/cms_pages_spec.rb
 - spec/helpers/kuhsaft/cms/application_helper_spec.rb
 - spec/kuhsaft_spec.rb
@@ -463,7 +460,6 @@ files:
 - spec/models/accordion_item_brick_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/brick_spec.rb
-- spec/models/cms/admin_spec.rb
 - spec/models/column_brick_spec.rb
 - spec/models/image_brick_spec.rb
 - spec/models/image_size_spec.rb
@@ -477,7 +473,6 @@ files:
 - spec/models/video_brick_spec.rb
 - spec/spec_helper.rb
 - spec/support/kuhsaft_spec_helper.rb
-- spec/support/request_macros.rb
 homepage: http://github.com/screenconcept/kuhsaft
 licenses: []
 post_install_message: 
@@ -492,7 +487,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4571634314470710122
+      hash: -2215178386660071528
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -501,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4571634314470710122
+      hash: -2215178386660071528
 requirements: []
 rubyforge_project: kuhsaft
 rubygems_version: 1.8.24
@@ -542,7 +537,6 @@ test_files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb
-- spec/features/cms_auth_spec.rb
 - spec/features/cms_pages_spec.rb
 - spec/helpers/kuhsaft/cms/application_helper_spec.rb
 - spec/kuhsaft_spec.rb
@@ -553,7 +547,6 @@ test_files:
 - spec/models/accordion_item_brick_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/brick_spec.rb
-- spec/models/cms/admin_spec.rb
 - spec/models/column_brick_spec.rb
 - spec/models/image_brick_spec.rb
 - spec/models/image_size_spec.rb
@@ -567,4 +560,3 @@ test_files:
 - spec/models/video_brick_spec.rb
 - spec/spec_helper.rb
 - spec/support/kuhsaft_spec_helper.rb
-- spec/support/request_macros.rb

data/app/models/kuhsaft/cms/admin.rb

@@ -1,20 +0,0 @@
-module Kuhsaft
-  module Cms
-    class Admin < ActiveRecord::Base
-      devise :database_authenticatable, :rememberable
-      attr_accessible :email, :password, :password_confirmation, :remember_me
-
-      def admin?
-        true
-      end
-
-      def editor?
-        false
-      end
-
-      def author?
-        false
-      end
-    end
-  end
-end

data/config/initializers/devise.rb

@@ -1,231 +0,0 @@
-# Use this hook to configure devise mailer, warden hooks and so forth.
-# Many of these configuration options can be set straight in your model.
-Devise.setup do |config|
-  # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
-
-  # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
-
-  # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default) and
-  # :mongoid (bson_ext recommended) by default. Other ORMs may be
-  # available as additional gems.
-  require 'devise/orm/active_record'
-
-  # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating a user. The default is
-  # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating a user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
-  # You can also supply a hash where the value is a boolean determining whether
-  # or not authentication should be aborted when the value is not present.
-  # config.authentication_keys = [ :email ]
-
-  # Configure parameters from the request object used for authentication. Each entry
-  # given should be a request method and it will automatically be passed to the
-  # find_for_authentication method and considered in your model lookup. For instance,
-  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
-  # The same considerations mentioned for authentication_keys also apply to request_keys.
-  # config.request_keys = []
-
-  # Configure which authentication keys should be case-insensitive.
-  # These keys will be downcased upon creating or modifying a user and when used
-  # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [ :email ]
-
-  # Configure which authentication keys should have whitespace stripped.
-  # These keys will have whitespace before and after removed upon creating or
-  # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [ :email ]
-
-  # Tell if authentication through request.params is enabled. True by default.
-  # It can be set to an array that will enable params authentication only for the
-  # given strategies, for example, `config.params_authenticatable = [:database]` will
-  # enable it only for database (email + password) authentication.
-  # config.params_authenticatable = true
-
-  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
-  # It can be set to an array that will enable http authentication only for the
-  # given strategies, for example, `config.http_authenticatable = [:token]` will
-  # enable it only for token authentication.
-  # config.http_authenticatable = false
-
-  # If http headers should be returned for AJAX requests. True by default.
-  # config.http_authenticatable_on_xhr = true
-
-  # The realm used in Http Basic Authentication. "Application" by default.
-  # config.http_authentication_realm = "Application"
-
-  # It will change confirmation, password recovery and other workflows
-  # to behave the same regardless if the e-mail provided was right or wrong.
-  # Does not affect registerable.
-  # config.paranoid = true
-
-  # By default Devise will store the user in session. You can skip storage for
-  # :http_auth and :token_auth by adding those symbols to the array below.
-  # Notice that if you are skipping storage for all authentication paths, you
-  # may want to disable generating routes to Devise's sessions controller by
-  # passing :skip => :sessions to `devise_for` in your config/routes.rb
-  config.skip_session_storage = [:http_auth]
-
-  # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
-  # using other encryptors, it sets how many times you want the password re-encrypted.
-  #
-  # Limiting the stretches to just one in testing will increase the performance of
-  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments.
-  config.stretches = Rails.env.test? ? 1 : 10
-
-  # Setup a pepper to generate the encrypted password.
-  # config.pepper = "2384ca9bc8766c6b40e6b055c0e9244680c06e48db1aaf3c281c0d4974bd177b51aa696c92743fb5e32d138d7945db111fac9c570d1550a1fdaf5f55a721673a"
-
-  # ==> Configuration for :confirmable
-  # A period that the user is allowed to access the website even without
-  # confirming his account. For instance, if set to 2.days, the user will be
-  # able to access the website for two days without confirming his account,
-  # access will be blocked just in the third day. Default is 0.days, meaning
-  # the user cannot access the website without confirming his account.
-  # config.allow_unconfirmed_access_for = 2.days
-
-  # If true, requires any email changes to be confirmed (exactly the same way as
-  # initial account confirmation) to be applied. Requires additional unconfirmed_email
-  # db field (see migrations). Until confirmed new email is stored in
-  # unconfirmed email column, and copied to email column on successful confirmation.
-  config.reconfirmable = true
-
-  # Defines which key will be used when confirming an account
-  # config.confirmation_keys = [ :email ]
-
-  # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
-
-  # If true, extends the user's remember period when remembered via cookie.
-  # config.extend_remember_period = false
-
-  # Options to be passed to the created cookie. For instance, you can set
-  # :secure => true in order to force SSL only cookies.
-  # config.rememberable_options = {}
-
-  # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
-  # config.password_length = 6..128
-
-  # Email regex used to validate email formats. It simply asserts that
-  # an one (and only one) @ exists in the given string. This is mainly
-  # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
-
-  # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
-
-  # If true, expires auth token on session timeout.
-  # config.expire_auth_token_on_timeout = false
-
-  # ==> Configuration for :lockable
-  # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
-
-  # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [ :email ]
-
-  # Defines which strategy will be used to unlock an account.
-  # :email = Sends an unlock link to the user email
-  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
-
-  # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
-  # config.maximum_attempts = 20
-
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
-
-  # ==> Configuration for :recoverable
-  #
-  # Defines which key will be used when recovering the password for an account
-  # config.reset_password_keys = [ :email ]
-
-  # Time interval you can reset your password with a reset password key.
-  # Don't put a too small interval or your users won't have the time to
-  # change their passwords.
-  config.reset_password_within = 6.hours
-
-  # ==> Configuration for :encryptable
-  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
-  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
-  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
-  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
-  # REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :sha512
-
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
-
-  # ==> Scopes configuration
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "users/sessions/new". It's turned off by default because it's slower if you
-  # are using only default views.
-  # config.scoped_views = false
-
-  # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes (usually :user).
-  # config.default_scope = :user
-
-  # Set this configuration to false if you want /users/sign_out to sign out
-  # only the current scope. By default, Devise signs out all scopes.
-  # config.sign_out_all_scopes = true
-
-  # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
-  #
-  # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists.
-  #
-  # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ["*/*", :html]
-
-  # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :delete
-
-  # ==> OmniAuth
-  # Add a new OmniAuth provider. Check the wiki for more information on setting
-  # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-
-  # ==> Warden configuration
-  # If you want to use other strategies, that are not supported by Devise, or
-  # change the failure app, you can configure them inside the config.warden block.
-  #
-  # config.warden do |manager|
-  #   manager.intercept_401 = false
-  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
-  # end
-
-  # ==> Mountable engine configurations
-  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
-  # is mountable, there are some extra configurations to be taken into account.
-  # The following options are available, assuming the engine is mounted as:
-  #
-  #     mount MyEngine, at: "/my_engine"
-  #
-  config.router_name = :kuhsaft
-  #
-  # When using omniauth, Devise cannot automatically set Omniauth path,
-  # so you need to do it manually. For the users scope, it would be:
-  # config.omniauth_path_prefix = "/my_engine/users/auth"
-end

data/db/migrate/05_create_kuhsaft_cms_admins.rb

@@ -1,46 +0,0 @@
-class CreateKuhsaftCmsAdmins < ActiveRecord::Migration
-  def change
-    create_table(:kuhsaft_cms_admins) do |t|
-      ## Database authenticatable
-      t.string :email,              :null => false, :default => ""
-      t.string :encrypted_password, :null => false, :default => ""
-
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      t.integer  :sign_in_count, :default => 0
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
-
-      ## Confirmable
-      # t.string   :confirmation_token
-      # t.datetime :confirmed_at
-      # t.datetime :confirmation_sent_at
-      # t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-      ## Token authenticatable
-      # t.string :authentication_token
-
-      t.timestamps
-    end
-
-    add_index :kuhsaft_cms_admins, :email,                :unique => true
-    add_index :kuhsaft_cms_admins, :reset_password_token, :unique => true
-    # add_index :kuhsaft_cms_admins, :confirmation_token,   :unique => true
-    # add_index :kuhsaft_cms_admins, :unlock_token,         :unique => true
-    # add_index :kuhsaft_cms_admins, :authentication_token, :unique => true
-  end
-end
-

data/spec/features/cms_auth_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe 'Admin authentication' do
-  sign_in_cms_admin
-
-  it 'redirects to the pages index' do
-    current_path.should == kuhsaft.cms_pages_path
-  end
-end

data/spec/models/cms/admin_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe Kuhsaft::Cms::Admin do
-
-  let :admin do
-    Kuhsaft::Cms::Admin.new
-  end
-
-  describe '#admin?' do
-    it 'is true and the default' do
-      admin.admin?.should be_true
-    end
-  end
-
-  describe '#editor?' do
-    it 'is false' do
-      admin.editor?.should be_false
-    end
-  end
-
-  describe '#author?' do
-    it 'is false' do
-      admin.author?.should be_false
-    end
-  end
-end

data/spec/support/request_macros.rb

@@ -1,19 +0,0 @@
-module RequestMacros
-
-  def sign_in_cms_admin
-    before do
-      Kuhsaft::Cms::Admin.create(:email => 'max@demo.com',
-                                 :password => '123456',
-                                 :password_confirmation => '123456')
-
-      visit kuhsaft.cms_pages_path
-
-      within "#new_cms_admin" do
-        fill_in "Email", :with => 'max@demo.com'
-        fill_in "Password", :with => '123456'
-        click_on "Sign in"
-      end
-    end
-  end
-
-end