ish_manager 0.1.8.139 → 0.1.8.140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d677c9f50a1705856286f15af4e4dd837ebef30c
-  data.tar.gz: fcec94bc81878c95bae62d775133f09a203add1c
+  metadata.gz: 1ca06aa4ea116212dfc733e9cbc090b361367e8a
+  data.tar.gz: 017f93a08cf89d5c8e878c0ef69339c2833fa194
 SHA512:
-  metadata.gz: b603e846f99fb0571831dc9b4e219143c420b7f16bee26212066f117569d46f053f86a8967ba4a268b4ebdb4450a52c866c04938225419b089000fdcafa43e6a
-  data.tar.gz: c9916bae0a5967242ce34c6ceca02ec9d947bc72d801127d6313309fe1b7362086d2a82973f814a74efc3fd1c899ab37666c004490a6dd181631d289079218de
+  metadata.gz: 3d9dd7b67b11634f3ce5939fcf88308d7a6ab687d941a7c5df3d317a328c9be3c27b07b92662369d695d86d713b6a663b28590808ec1cf8e427aa7699927cedc
+  data.tar.gz: 766a31ae9d19d6c90ad4d817a859adbb108deafba1e6f95640fe44a0185035e879c93b88bbfec577f018b90b6b15f65e2f588506580c625894d06d24251176dc

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

@@ -12,6 +12,7 @@
  *
  *= require ish_manager/bootstrap
  *= require_self
+ *= require ish_manager/tags
  */
 
 
@@ -128,13 +129,6 @@ nav.pagination
   font-size: 1.6em;
 }
 
-/**
- * tags
- */
-ul.tags ul.tags {
-  margin-left: 2em;
-}
-
 /**
  * ally, stock watches
  */

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

@@ -0,0 +1,7 @@
+
+/**
+ * tags
+ */
+ul.tags ul.tags {
+  margin-left: 2em;
+}

data/app/controllers/ish_manager/cities_controller.rb

@@ -29,7 +29,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
       flash[:notice] = 'Success'
       redirect_to cities_path
     else
-      flash[:error] = 'No Luck'
+      flash[:alert] = 'No Luck'
       render :action => :new
     end
   end
@@ -51,7 +51,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
       flash[:notice] = 'Success'
       redirect_to edit_city_path @city.id
     else
-      flash[:error] = 'No Luck. ' + @city.errors.inspect
+      flash[:alert] = 'No Luck. ' + @city.errors.inspect
       @newsitems = @city.newsitems.all.page( params[:newsitems_page] )
       @features = @city.features.all.page( params[:features_page] )
       @photo = Photo.new
@@ -70,7 +70,7 @@ class IshManager::CitiesController < IshManager::ApplicationController
     if flag && flagg
       flash[:notice] = 'Success'
     else
-      flash[:error] = "No Luck. #{@photo.errors.inspect} #{@city.errors.inspect}"
+      flash[:alert] = "No Luck. #{@photo.errors.messages} #{@city.errors.messages}"
     end
     redirect_to cities_path
   end

data/app/controllers/ish_manager/events_controller.rb

@@ -6,6 +6,10 @@ class IshManager::EventsController < IshManager::ApplicationController
   def index
     authorize! :index, ::Event
     @events = Event.all
+    if params[:city_id]
+      @resource = City.find( params[:city_id] )
+      @events = @resource.events
+    end
   end
 
   def new
@@ -34,6 +38,11 @@ class IshManager::EventsController < IshManager::ApplicationController
     @event = Event.find params[:id]
     authorize! :update, @event
 
+    if params[:photo]
+      photo = Photo.new :photo => params[:photo]
+      @event.profile_photo = photo
+    end
+
     flag = @event.update_attributes params[:event].permit!
     if flag
       @event.city.touch

data/app/controllers/ish_manager/features_controller.rb

@@ -109,7 +109,7 @@ class IshManager::FeaturesController < IshManager::ApplicationController
       flash[:notice] = 'updated feature'
       redirect_to redirect_path
     else
-      flash[:error] = 'No Luck. ' + @feature.errors.messages
+      flash[:alert] = 'No Luck. ' + @feature.errors.messages
       render :action => :edit
     end    
   end
@@ -139,9 +139,9 @@ class IshManager::FeaturesController < IshManager::ApplicationController
 
     if @feature.destroy
       @resource.touch
-      flash[:notice] = :'Success.' 
+      flash[:notice] = 'Success.'
     else
-      flash[:error] = :'No luck.'
+      flash[:alert] = "No luck. " + @feature.errors.messages
     end
     redirect_to request.referrer
   end

data/app/controllers/ish_manager/galleries_controller.rb

@@ -48,7 +48,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
       redirect_to galleries_path
     else
       puts! @gallery.errors.messages
-      flash[:error] = 'No Luck. ' + @gallery.errors.inspect
+      flash[:alert] = 'No Luck. ' + @gallery.errors.inspect
       @cities_list = City.list
       @tags_list = Tag.list
       render :action => 'new'
@@ -81,7 +81,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
       redirect_to galleries_path
     else
       puts! @gallery.errors.messages, 'cannot save gallery'
-      flash[:error] = 'No Luck. ' + @gallery.errors.messages.to_s
+      flash[:alert] = 'No Luck. ' + @gallery.errors.messages.to_s
       render :action => :edit
     end
   end                           

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -108,7 +108,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     if flag
       flash[:notice] = 'Success'
     else
-      flash[:error] = "No Luck: #{@newsitem.errors.messages}"
+      flash[:alert] = "No Luck: #{@newsitem.errors.messages}"
     end
 
     redirect_to url

data/app/controllers/ish_manager/reports_controller.rb

@@ -130,7 +130,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
           @site.touch
           if @site.save
           else
-            flash[:error] = (flash[:error]||'') + 'City could not be saved (newsitem). '
+            flash[:alert] = (flash[:alert]||'') + 'City could not be saved (newsitem). '
           end
         end
 
@@ -140,7 +140,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
         format.json { render :json => @report, :status => :created, :location => @report }
       else
         format.html do
-          flash[:error] = @report.errors.inspect
+          flash[:alert] = @report.errors.inspect
           @tags_list = Tag.all.where( :is_public => true ).list
           @sites_list = Site.all.list
           @cities_list = City.all.list

data/app/controllers/ish_manager/sites_controller.rb

@@ -38,7 +38,7 @@ class IshManager::SitesController < IshManager::ApplicationController
     if @site.save
       flash[:notice] = 'Success'
     else
-      flash[:error] = 'No Luck. ' + @site.errors.inspect
+      flash[:alert] = 'No Luck. ' + @site.errors.inspect
     end
     redirect_to sites_path
   end
@@ -50,7 +50,7 @@ class IshManager::SitesController < IshManager::ApplicationController
     if @site.update_attributes params[:site].permit!
       flash[:notice] = 'Success'
     else
-      flash[:error] = 'No Luck'
+      flash[:alert] = 'No Luck'
     end
     redirect_to sites_path
   end

data/app/controllers/ish_manager/tags_controller.rb

@@ -4,7 +4,14 @@ class IshManager::TagsController < IshManager::ApplicationController
   before_action :set_lists
 
   def index
-    @tags = Tag.unscoped.where( :parent_tag_id => nil ).order_by( :name => :asc )
+    @resource = City.find( params[:city_id] ) if params[:city_id]
+
+    if @resource
+      @tags = @resource.tags
+    else
+      @tags = Tag.unscoped.where( :parent_tag_id => nil ).order_by( :name => :asc )
+    end
+
     authorize! :index, Tag.new
 
     @site = Site.find( params[:site_id] ) if params[:site_id] 
@@ -28,11 +35,12 @@ class IshManager::TagsController < IshManager::ApplicationController
     @tag = Tag.create params[:tag].permit!
     authorize! :create, @tag
     if @tag.save
+      do_touch
       flash[:notice] = 'Success.'
       redirect_to tags_path
     else
       puts! @tag.errors, "error creating tag."
-      flash[:error] = "No luck. #{@tag.errors.messages}" 
+      flash[:alert] = "No luck. #{@tag.errors.messages}" 
       render :action => :new
     end
   end
@@ -47,12 +55,11 @@ class IshManager::TagsController < IshManager::ApplicationController
     authorize! :update, @tag
 
     if @tag.update_attributes params[:tag].permit!
-      @tag.site.touch if @tag.site
-
+      do_touch
       flash[:notice] = 'Success.'
       redirect_to tags_path
     else
-      flash[:error] = 'No luck.'
+      flash[:alert] = 'No luck.'
       render :action => :new
     end
   end
@@ -61,6 +68,7 @@ class IshManager::TagsController < IshManager::ApplicationController
     @tag = Tag.unscoped.find params[:id]
     authorize! :destroy, @tag
     if @tag.destroy
+      do_touch
       flash[:notice] = 'Success'
     else
       flash[:alert] = "Cannot destroy tag: #{@tag.errors.messages}"
@@ -68,6 +76,13 @@ class IshManager::TagsController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
+  private
+
+  def do_touch
+    @tag.city.touch if @tag.city
+    @tag.site.touch if @tag.site
+  end
+
 end
 
 

data/app/controllers/ish_manager/videos_controller.rb

@@ -71,7 +71,7 @@ class IshManager::VideosController < IshManager::ApplicationController
       flash[:notice] = 'Success'      
       redirect_to videos_path
     else
-      flash[:error] = 'No luck'
+      flash[:alert] = 'No luck'
       @tags_list = Tag.list
       @cities_list = City.list
       render :action => 'new'
@@ -96,7 +96,7 @@ class IshManager::VideosController < IshManager::ApplicationController
       flash[:notice] = 'Success.'
       redirect_to videos_path
     else
-      flash[:error] = "No luck: #{@video.errors}"
+      flash[:alert] = "No luck: #{@video.errors.messages}"
       render :edit
     end
   end

data/app/helpers/ish_manager/application_helper.rb

@@ -23,5 +23,12 @@ module IshManager
       date.to_s[0, 10]
     end
 
+    def resource_path resource
+      case resource.class.name
+      when 'City'
+        city_path( resource.id )
+      end
+    end
+
   end
 end

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

@@ -2,7 +2,7 @@
   .b
     %h2
       = @city.name
-      = link_to '[~]', edit_city_path(@city)
+      = link_to image_edit, edit_city_path(@city)
       <#{@city.x}, #{@city.y}>
     <em>#{@city.cityname}</em>
     %br
@@ -11,24 +11,29 @@
 
     %ul.menu-secondary
       %li
-        = link_to '[+]', new_city_feature_path( @city )
+        = link_to image_new, new_city_feature_path( @city )
         Features (#{@city.features.length})
       %li
-        = link_to '[+]', new_city_newsitem_path( @city )
+        = link_to image_new, new_city_newsitem_path( @city )
         Newsitems (#{@city.newsitems.length})
       %li
-        = link_to '[+]', new_city_report_path( @city )
+        = link_to image_new, new_city_report_path( @city )
         Reports (#{@city.reports.count})
       %li
-        = link_to '[+]', new_city_gallery_path( @city )
+        = link_to image_new, new_city_gallery_path( @city )
         Galleries (#{@city.galleries.count})
       %li
-        = link_to '[+]', new_city_video_path( @city )
+        = link_to image_new, new_city_video_path( @city )
         Videos (#{@city.videos.count})
       %li
-        = link_to '[+]', new_city_venue_path( @city )
+        = link_to image_new, new_city_venue_path( @city )
         Venues (#{@city.venues.count})
       %li
-        = link_to '[+]', new_city_event_path( @city )
-        Events (#{@city.events.count})
+        = link_to image_new, new_city_event_path( @city )
+        = link_to 'Events', city_events_path( @city )
+        (#{@city.events.count})
+      %li
+        = link_to image_new, new_city_tag_path( @city )
+        = link_to 'Tags', city_tags_path( @city )
+        (#{@city.tags.count})
     %hr

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

@@ -12,7 +12,6 @@
           .panel-heading
             = link_to city.name, city_path(city)
             = link_to '[~]', edit_city_path(city)
-            .small.gray= city.id
             .cities-meta= "R(#{city.reports.length}) G(#{city.galleries.length}) V(#{city.videos.length}) U(#{city.current_users.length})"
     
           - if city.profile_photo.blank?

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

@@ -6,6 +6,7 @@
 = render 'header', :city => @city
 = render 'ish_manager/features/index', :features => @city.features, :city => @city
 = render 'ish_manager/newsitems/index', :newsitems => @city.newsitems, :city => @city
+
 .row
   .col-sm-6= render 'ish_manager/reports/index', :reports => @city.reports
   .col-sm-6= render 'ish_manager/galleries/index', :galleries => @city.galleries # @TODO: why not render index?

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

@@ -1,24 +1,45 @@
 
-= form_for event do |f|
-  .a
-    = f.label :name
-    = f.text_field :name
+= form_for event, :html => { :multipart => true } do |f|
+  .row
+    .col-sm-4
+      .input-field
+        = f.label :name
+        = f.text_field :name
+    .col-sm-4
+      .input-field
+        = f.label :eventname
+        = f.text_field :eventname
+    .col-sm-4
+      .input-field
+        = f.label :date
+        = f.text_field :date
 
-  .a
-    = f.label :eventname
-    = f.text_field :eventname
+  .row
+    .col-sm-6
+      .input-field
+        = f.select :city, options_for_select( @cities_list, :selected => event.city_id )
+        = f.label :city
+    .col-sm-3
+      .input-field
+        = f.text_field :x
+        = f.label :x
+    .col-sm-3
+      .input-field
+        = f.text_field :y
+        = f.label :y
 
-  .a
-    = f.label :city
-    = f.select :city, options_for_select( @cities_list, :selected => event.city_id )
+  .row
+    .col-sm-12
+      .input-field
+        = f.text_area :description, :class => [ :tinymce ]
+        %br
+        %br
+        = file_field_tag :photo
+        - begin
+          = image_tag event.profile_photo.photo.url(:thumb)
+        - rescue
 
-  .a
-    = f.label :date
-    = f.text_field :date
-
-  .a
-    = f.text_area :description, :class => [ :tinymce ] 
-    
-  .a
-    = f.submit
+        %br
+        %br
+        = f.submit
     

data/app/views/ish_manager/events/_index.haml

@@ -1,6 +1,9 @@
 
 .manager-events--index
-  %h5 Events (#{events.length}) #{link_to new_img, new_event_path}
+  %h5
+    Events (#{events.length}) #{link_to new_img, new_event_path}
+    - if @resource
+      in #{@resource.class.name} #{link_to @resource.name, resource_path( @resource )}
   %table
     %tr
       %th actions

data/app/views/ish_manager/galleries/new.haml

@@ -2,6 +2,5 @@
 .row
   .large-12.columns
     %h3 New Gallery
-    = flash[:error]
     
 = render 'form', :gallery => @gallery

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

@@ -9,15 +9,21 @@
       .input-field
         = f.label :name
         = f.text_field :name
+        
     .col-xs-12.col-md-6
       .input-field
-        = f.label :name_seo
         = f.text_field :name_seo
+        = f.label :name_seo
   .row      
     .col-xs-12.col-md-6
       .input-field
         = f.select :parent_tag_id, options_for_select( @tags_list, :selected => ( params[:for_tag] || @tag.parent_tag_id ) )
         = f.label "parent tag"
+  .row
+    .col-xs-12.col-md-6
+      .input-field 
+        = f.select :city, options_for_select( @cities_list, :selected => @tag.city_id )
+        = f.label "city"
     .col-xs-12.col-md-6
       .input-field 
         = f.select :site, options_for_select( @sites_list, :selected => @tag.site_id )

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

@@ -8,9 +8,10 @@
   .small-12.columns
     .center
       %h1
-        Tags (#{Tag.count})
-        = link_to '[+]', new_tag_path
-  
+        Tags (#{@tags.count}) #{link_to image_new, new_tag_path}
+        - if @resource
+          in #{@resource.class.name} #{link_to @resource.name, resource_path(@resource)}
+        
     %ul.tags
       - @tags.each do |tag|
         = render 'item', :tag => tag

data/config/routes.rb

@@ -12,6 +12,7 @@ IshManager::Engine.routes.draw do
     resources :videos
     resources :events
     resources :venues
+    resources :tags
   end
 
   resources :email_templates

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.139
+  version: 0.1.8.140
 platform: ruby
 authors:
 - piousbox
@@ -150,6 +150,7 @@ files:
 - app/assets/stylesheets/ish_manager/application.css
 - app/assets/stylesheets/ish_manager/bootstrap.css
 - app/assets/stylesheets/ish_manager/materialize.css
+- app/assets/stylesheets/ish_manager/tags.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
 - app/controllers/ish_manager/ally_controller.rb