ish_manager 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ce0fccb4817d3a05391277ec43e57ace793dddf
-  data.tar.gz: 0337cc6d5583e8d51413f572fd6b00a9778ee379
+  metadata.gz: 0cfa88bf3f34c888931d6c74c7947a808bfba2e3
+  data.tar.gz: d2accbb15d1c9ddff1752369420a11e2e1def753
 SHA512:
-  metadata.gz: 3e6c620f49ea91881f1f368f0e3551675dfb2bdab9762757c4ddc4dadf88191ad8c75fff08bf0e0d62be9f97156e1ee1fa3200e755ff26e033c000d748cbea87
-  data.tar.gz: e8b39c52bbf2b540eb270da8621f88903d6d3a7628e42e9173bb5e26ca5d353661a681f5aa155364ca91aa3e5db140d3b3328653699aeef1428ad8d6d7f000e1
+  metadata.gz: edad58e14796b84da5ea868aac3cafb6779daa0f2f73516f2ceef82a1609ec0bd79c8e2d57bc7d8bf57ca24c6a839034d13e0d48e0d2fa1986a0c48847b0336a
+  data.tar.gz: e5ee903cd3e72877bb8b733c90da50b0e75a9037b872340c648cc815cc0a7681bfeafbb7e313c0d2480c508b13ce6e9477f6736cb5ce9fe003db6996ec9c7b2a

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

@@ -12,3 +12,4 @@
 //
 //= require_tree .
 //
+

data/app/assets/stylesheets/ish_manager/application.css

@@ -13,7 +13,3 @@
  *= require_tree .
  *= require_self
  */
-
-.center {
-  text-align: center;
-}

data/app/controllers/ish_manager/application_controller.rb

@@ -1,8 +1,8 @@
 module IshManager
   class ApplicationController < ActionController::Base
     protect_from_forgery :with => :exception
+
     before_action :set_current_ability
-    check_authorization
 
     def home
       authorize! :home, Manager

data/app/controllers/ish_manager/sites_controller.rb

@@ -1,7 +1,6 @@
 class IshManager::SitesController < IshManager::ApplicationController
   
   def index
-    authorize! :index, @site
     @sites = Site.all.order_by( :domainname => :desc, :lang => :desc )
   end
 
@@ -13,7 +12,6 @@ class IshManager::SitesController < IshManager::ApplicationController
 
   def show
     @site = Site.find params[:id]
-    authorize! :show, @site
     @galleries = @site.galleries.unscoped.where({ :is_trash => false }).page( params[:galleries_page] ).per( 10 )
     @reports = @site.reports.unscoped.where({ :is_trash => false }).page( params[:reports_page] ).per( 10 )
     @videos = @site.videos.page( params[:videos_page] ).per( 5 )

data/app/helpers/ish_manager/images_helper.rb

@@ -30,8 +30,7 @@ module IshManager::ImagesHelper
   end
 
   def image_flag locale
-    # image_tag "flags/#{locale.to_s}.png"
-    "[#{locale.to_s}]"
+    image_tag "flags/#{locale.to_s}.png"
   end
 
   def image_city cityname

data/app/views/ish_manager/application/_main_footer.haml

@@ -3,12 +3,8 @@
 %ul
   %li ^__^
   - if current_user
-    %li
-      >[ #{current_user.email} ]<
-      %div{ :style => 'float: left' }= button_to '[x]', main_app.destroy_user_session_path, :method => :delete
+    %li >[ #{current_user.email} ]<
   - else
-    %li
-      Please log in
-      = link_to '[+]', main_app.new_user_session_path
+    %li Please log in
 
 

data/app/views/ish_manager/cities/edit.haml

@@ -1,11 +1,11 @@
 
 %h1.center= @city.name
-= render 'form', :url => city_path
+= render 'form', :url => manager_city_path
 %hr
 
 .row
   .small-12.columns
-    = render 'ish_manager/features/index', :features => @city.features, :city => @city
+    = render 'manager/features/index', :features => @city.features, :city => @city
 %hr
-= render 'ish_manager/newsitems/index', :newsitems => @city.newsitems, :city => @city
+= render 'manager/newsitems/index', :newsitems => @city.newsitems, :city => @city
 

data/app/views/ish_manager/sites/_form.haml

@@ -1,5 +1,5 @@
 
-- url ||= site_path(site)
+- url ||= manager_site_path(site)
 .manager-sites--form
   = form_for site, :url => url do |f|
     .row

data/app/views/ish_manager/sites/edit.haml

@@ -5,5 +5,5 @@
     %br
     %br
       
-= render 'form', :site => @site
-= render 'ish_manager/newsitems/index', :newsitems => @site.newsitems.limit(10), :site => @site
+= render 'manager/sites/form', :site => @site
+= render 'manager/newsitems/index', :newsitems => @site.newsitems.limit(10), :site => @site

data/app/views/ish_manager/sites/index.haml

@@ -1,11 +1,11 @@
 
-.sites-index
-  %h3 Sites
+.manager-sites-index
   .row
-    - @sites.each do |site|
-      .col-xs-6
-        .panel.panel-primary
-          .panel-body
+    .large-12.columns
+      %h3 Sites
+      %ul.large-block-grid-2
+        - @sites.each do |site|
+          %li
             %h4
               = link_to "http://#{site.domain}/#{site.lang}", site_path( site )
               = link_to '[~]', edit_site_path( site )
@@ -24,4 +24,4 @@
                 #{site.tags.length} tags
               %li
                 #{site.videos.length} videos
-        
+            

data/app/views/layouts/ish_manager/application.haml

@@ -9,6 +9,5 @@
     = render :partial => 'ish_manager/application/main_header'
     %p.notice= notice
     %p.alert= alert
-    .container
-      = yield
+    = yield
     = render :partial => 'ish_manager/application/main_footer'

data/config/routes.rb

@@ -1,14 +1,11 @@
 IshManager::Engine.routes.draw do
   root :to => 'application#home'
 
-  resources :cities do
-    resources :features
-  end
+  resources :cities
   resources :events
   resources :galleries
   resources :newsitems
   resources :reports
-  resources :photos
   resources :sites do
     resources :galleries
     resources :reports

data/lib/ish_manager.rb

@@ -2,8 +2,6 @@
 require "ish_manager/engine"
 require 'haml'
 require 'cancancan'
-require 'kaminari/mongoid'
-require 'kaminari/actionview'
 
 module IshManager
   # Your code goes here...

data/lib/ish_manager/version.rb

@@ -1,3 +1,3 @@
 module IshManager
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - piousbox
@@ -80,34 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
-- !ruby/object:Gem::Dependency
-  name: kaminari-mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: kaminari-actionview
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Description of IshManager.
 email:
 - piousbox@gmail.com
@@ -427,15 +399,8 @@ files:
 - app/assets/stylesheets/ish_manager/bootstrap.min.css.map
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
-- app/controllers/ish_manager/features_controller.rb
-- app/controllers/ish_manager/galleries_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb~
-- app/controllers/ish_manager/newsitems_controller.rb
-- app/controllers/ish_manager/photos_controller.rb
-- app/controllers/ish_manager/reports_controller.rb
 - app/controllers/ish_manager/sites_controller.rb
-- app/controllers/ish_manager/tags_controller.rb
-- app/controllers/ish_manager/users_controller.rb
 - app/helpers/ish_manager/application_helper.rb
 - app/helpers/ish_manager/images_helper.rb
 - app/jobs/ish_manager/application_job.rb
@@ -456,67 +421,23 @@ files:
 - app/views/ish_manager/cities/new_feature.haml
 - app/views/ish_manager/cities/new_newsitem.haml
 - app/views/ish_manager/cities/show.haml
-- app/views/ish_manager/features/_form.haml
-- app/views/ish_manager/features/_index.haml
 - app/views/ish_manager/features/_index.haml~
-- app/views/ish_manager/features/_item.haml
-- app/views/ish_manager/features/edit.haml
-- app/views/ish_manager/features/index.haml
-- app/views/ish_manager/features/new.haml
-- app/views/ish_manager/features/show.haml
-- app/views/ish_manager/galleries/#_thumbs.haml#
-- app/views/ish_manager/galleries/_form.haml
-- app/views/ish_manager/galleries/_index.haml
-- app/views/ish_manager/galleries/_list.haml
 - app/views/ish_manager/galleries/_list.haml~
-- app/views/ish_manager/galleries/_list_short.haml
-- app/views/ish_manager/galleries/_menu_secondary.haml
 - app/views/ish_manager/galleries/_menu_secondary.haml~
-- app/views/ish_manager/galleries/_meta.haml
 - app/views/ish_manager/galleries/_meta.haml~
-- app/views/ish_manager/galleries/_search.haml
 - app/views/ish_manager/galleries/_search.haml~
-- app/views/ish_manager/galleries/_thumbs.haml
 - app/views/ish_manager/galleries/_thumbs.haml~
-- app/views/ish_manager/galleries/_title.haml
-- app/views/ish_manager/galleries/all_photos.haml
-- app/views/ish_manager/galleries/edit.haml
-- app/views/ish_manager/galleries/index.haml
 - app/views/ish_manager/galleries/index.haml~
-- app/views/ish_manager/galleries/index_ajax.haml
-- app/views/ish_manager/galleries/index_mini.haml
-- app/views/ish_manager/galleries/index_short.haml
-- app/views/ish_manager/galleries/index_thumb.haml
-- app/views/ish_manager/galleries/index_title.haml
-- app/views/ish_manager/galleries/index_trash.haml
-- app/views/ish_manager/galleries/new.haml
-- app/views/ish_manager/galleries/show.haml
 - app/views/ish_manager/galleries/show.haml~
-- app/views/ish_manager/newsitems/_form.haml
 - app/views/ish_manager/newsitems/_form.haml~
-- app/views/ish_manager/newsitems/_index.haml
 - app/views/ish_manager/newsitems/_index.haml~
-- app/views/ish_manager/newsitems/_item.haml
-- app/views/ish_manager/newsitems/edit.haml
 - app/views/ish_manager/newsitems/edit.haml~
-- app/views/ish_manager/newsitems/new.haml
-- app/views/ish_manager/photos/_meta.haml
-- app/views/ish_manager/photos/_multinew.haml
 - app/views/ish_manager/photos/_multinew.haml~
-- app/views/ish_manager/photos/show.haml
-- app/views/ish_manager/photos/without_gallery.haml
-- app/views/ish_manager/reports/_form.haml
-- app/views/ish_manager/reports/_index.haml
-- app/views/ish_manager/reports/edit.haml
-- app/views/ish_manager/reports/index.haml
-- app/views/ish_manager/reports/new.haml
-- app/views/ish_manager/reports/show.haml
 - app/views/ish_manager/sites/_form.haml
 - app/views/ish_manager/sites/edit.haml
 - app/views/ish_manager/sites/index.haml
 - app/views/ish_manager/sites/new.haml
 - app/views/ish_manager/sites/show.haml
-- app/views/ish_manager/videos/_index.haml
 - app/views/layouts/ish_manager/application.haml
 - app/views/layouts/ish_manager/application.haml~
 - config/routes.rb

data/app/controllers/ish_manager/features_controller.rb

@@ -1,125 +0,0 @@
-
-class Manager::FeaturesController < Manager::ManagerController
-
-  before_filter :set_lists
-  
-  def new
-    authorize! :new, ManagerFeature.new
-    @city = City.find params[:city_id] unless params[:city_id].blank?
-    @site = Site.find params[:site_id] unless params[:site_id].blank?
-    @tag = Tag.find params[:tag_id] unless params[:tag_id].blank?
-    @feature = Feature.new
-  end
-
-  def create
-    authorize! :create, ManagerFeature.new
-
-    @feature = Feature.new params[:feature].permit( :name, :subhead, :image_path, :link_path, :partial_name, :photo, :weight,
-                                                    :report, :report_id, :gallery, :gallery_id, :video, :video_id
-                                                  )
-    if params[:city_id]
-      @city = City.find params[:city_id]
-      @city.features << @feature
-      redirect_path = manager_cities_path
-    end
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @site.features << @feature
-      redirect_path = manager_sites_path
-    end
-    if params[:tag_id]
-      @tag = Tag.find params[:tag_id]
-      @tag.features << @feature
-      redirect_path = manager_tags_path
-    end
-
-    if (@city && @city.save) || (@site && @site.save) || (@tag && @tag.save)
-      flash[:notice] = 'Success.'
-      redirect_to redirect_path
-    else
-      flash[:error] = 'No Luck. ' + ( @city || @site || @tag ).errors.inspect
-      render :action => :new
-    end
-  end
-
-  def edit
-    authorize! :edit, ManagerCity.new
-    
-    if params[:city_id]
-      @city = City.find params[:city_id]
-      @feature = @city.features.find params[:id]
-    end
-
-    if params[:site_id]
-      @site = Site.find params[:site_id]
-      @feature = @site.features.find params[:id]
-    end
-
-    if params[:tag_id]
-      @tag = Tag.find params[:tag_id]
-      @feature = @tag.features.find params[:id]
-    end
-   
-    if params[:venue_id]
-      @venue = Tag.find params[:venue_id]
-      @feature = @venue.features.find params[:id]
-    end
-
-  end
-
-  def update
-    unless params[:city_id].blank?
-      @city = City.find params[:city_id] 
-      authorize! :update, ManagerCity.new
-      @feature = @city.features.find params[:id]
-      redirect_path = manager_city_path( @city )
-    end
-    unless params[:site_id].blank?
-      @site = Site.find params[:site_id] 
-      authorize! :update, ManagerSite.new
-      @feature = @site.features.find params[:id]
-      redirect_path = manager_site_path( @site )
-    end
-    unless params[:tag_id].blank?
-      @tag = Tag.find params[:tag_id]
-      authorize! :update, ManagerTag.new
-      @feature = @tag.features.find params[:id]
-      redirect_path = manager_tag_path( @tag )
-    end
-    
-    if @feature.update_attributes params[:feature].permit!
-      flash[:notice] = 'Success'
-      redirect_to redirect_path
-    else
-      flash[:error] = 'No Luck. ' + @feature.errors.inspect
-      puts! @feature.errors, 'Errors updating feature'
-      render :action => :edit_feature
-    end    
-  end
-
-  def index
-    if params[:tag_id]
-      @resource = Tag.find params[:tag_id]
-    end
-    
-  end
-
-  def destroy
-    if params[:tag_id]
-      @resource = Tag.find params[:tag_id]
-    elsif params[:city_id]
-      @resource = City.find params[:city_id]
-    elsif params[:site_id]
-      @resource = Site.find params[:site_id]
-    end
-    @feature = @resource.features.find params[:id]
-    if @feature.destroy
-      flash[:notice] = :'Success.' 
-    else
-      flash[:error] = :'No luck.'
-    end
-    redirect_to request.referrer
-  end
-  
-end
-

data/app/controllers/ish_manager/galleries_controller.rb

@@ -1,86 +0,0 @@
-class IshManager::GalleriesController < IshManager::ApplicationController
-
-  # before_action :set_lists
-  
-  def index
-    authorize! :index, Gallery
-    @galleries = Gallery.unscoped.where( :is_trash => false ).order_by( :created_at => :desc ).page( params[:galleries_page] ).per( 10 )
-  end
-
-  def index_thumb
-    @galleries = Gallery.unscoped.where( :is_trash => false ).order_by( :created_at => :desc ).page( params[:galleries_page] ).per( 10 )
-  end
-
-  def index_mini
-    @galleries = Gallery.all
-  end
-
-  def new
-    @gallery = Gallery.new
-    @cities_list = City.list
-    @tags_list = Tag.list
-  end
-
-  def create
-    @gallery = Gallery.new params[:gallery].permit!
-    @gallery.user = current_user
-    authorize! :create, @gallery
-
-    if @gallery.save
-      flash[:notice] = 'Success'
-      redirect_to manager_galleries_path
-    else
-      flash[:error] = 'No Luck. ' + @gallery.errors.inspect
-      @cities_list = City.list
-      @tags_list = Tag.list
-      render :action => 'new'
-    end
-  end
-
-  def edit
-    @gallery = Gallery.unscoped.find params[:id]
-  end
-
-  def update
-    @gallery = Gallery.unscoped.find params[:id]
-    if @gallery.update_attributes( params[:gallery].permit! )
-      flash[:notice] = 'Success.'
-      redirect_to manager_galleries_path
-    else
-      flash[:error] = 'No Luck. ' + @gallery.errors
-      render :action => :edit
-    end
-  end                           
-
-  def show
-    @gallery = Gallery.unscoped.find_by :galleryname => params[:id]
-    authorize! :show, @gallery
-    @photos = @gallery.photos.unscoped.where({ :is_trash => false })
-  end
-
-  def destroy
-    @gallery = Gallery.unscoped.find params[:id]
-    @gallery.is_trash = true
-    @gallery.save
-    flash[:notice] = 'Logically deleted gallery.'
-    redirect_to manager_galleries_title_path
-  end
-
-  def j_show
-    @gallery = Gallery.unscoped.find( params[:id] )
-    authorize! :show, @gallery
-    respond_to do |format|
-      format.json do
-        jjj = {}
-        jjj[:photos] = @gallery.photos.map do |ph|
-          { :thumbnail_url => ph.photo.url( :thumb ),
-          :delete_type => 'DELETE',
-          :delete_url => photo_path(ph) }
-        end
-        render :json => jjj
-      end
-    end
-  end
-
-end
-