ish_manager 0.1.3 → 0.1.6

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

@@ -14,6 +14,27 @@
  *= require_self
  */
 
+.bg-white {
+  background: white;
+  padding-bottom: 1em;
+}
+
+body {
+  background: #dedede;
+}
+
 .center {
   text-align: center;
 }
+
+hr {
+  background: red;
+  height: 1px;
+}
+
+.thumb {
+  background: dedede;
+  border: 1px solid red;
+  width: 100px;
+  height: 100px;
+}  

data/app/controllers/ish_manager/application_controller.rb

@@ -15,5 +15,15 @@ module IshManager
       @current_ability ||= ::IshManager::Ability.new( current_user )
     end
 
+    def set_lists
+      @sites_list = Site.all.list
+      @cities_list = City.all.list
+      @venues_list = Venue.all.list
+      @reports_list = Report.all.list
+      @galleries_list = Gallery.all.list
+      @videos_list = Video.all.list
+      @user_profiles_list = UserProfile.all.list
+    end
+
   end
 end

data/app/controllers/ish_manager/galleries_controller.rb

@@ -1,14 +1,18 @@
 class IshManager::GalleriesController < IshManager::ApplicationController
 
-  # before_action :set_lists
+  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 )
+    @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 )
+    @galleries = Gallery.unscoped.where( :is_trash => false 
+                                       ).order_by( :created_at => :desc 
+                                                 ).page( params[:galleries_page] ).per( 10 )
   end
 
   def index_mini
@@ -17,18 +21,19 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def new
     @gallery = Gallery.new
+    authorize! :new, @gallery
     @cities_list = City.list
     @tags_list = Tag.list
   end
 
   def create
     @gallery = Gallery.new params[:gallery].permit!
-    @gallery.user = current_user
     authorize! :create, @gallery
+    # @gallery.username = current_user.profile.username
 
     if @gallery.save
       flash[:notice] = 'Success'
-      redirect_to manager_galleries_path
+      redirect_to galleries_path
     else
       flash[:error] = 'No Luck. ' + @gallery.errors.inspect
       @cities_list = City.list
@@ -39,13 +44,15 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def edit
     @gallery = Gallery.unscoped.find params[:id]
+    authorize! :edit, @gallery
   end
 
   def update
     @gallery = Gallery.unscoped.find params[:id]
+    authorize! :update, @gallery
     if @gallery.update_attributes( params[:gallery].permit! )
       flash[:notice] = 'Success.'
-      redirect_to manager_galleries_path
+      redirect_to galleries_path
     else
       flash[:error] = 'No Luck. ' + @gallery.errors
       render :action => :edit
@@ -63,7 +70,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     @gallery.is_trash = true
     @gallery.save
     flash[:notice] = 'Logically deleted gallery.'
-    redirect_to manager_galleries_title_path
+    redirect_to galleries_path
   end
 
   def j_show

data/app/controllers/ish_manager/photos_controller.rb

@@ -11,6 +11,7 @@ class IshManager::PhotosController < IshManager::ApplicationController
 
   def destroy
     @photo = Photo.unscoped.find params[:id]
+    authorize! :destroy, @photo
     @photo.is_trash = true
     @photo.save
     redirect_to request.referrer
@@ -29,13 +30,11 @@ class IshManager::PhotosController < IshManager::ApplicationController
       gallery = Gallery.unscoped.where( :galleryname => params[:galleryname] ).first
       @photo.gallery_id = gallery.id
     elsif params[:gallery_id]
-      gallery = Gallery.find( params[:gallery_id] )
+      gallery = Gallery.unscoped.where( :galleryname => params[:gallery_id] ).first
+      gallery ||= Gallery.find( params[:gallery_id] )
       @photo.gallery_id = gallery.id
     end
    
-    # @TODO this is badd
-    @photo.user = User.where( :username => 'piousbox' ).first
-
     if @photo.save
       j = { :name => @photo.photo.original_filename,
         :size => @photo.photo.size,

data/app/models/ish_manager/ability.rb

@@ -2,13 +2,31 @@
 class IshManager::Ability
   include ::CanCan::Ability
 
-  def initialize user
+  def initialize user 
+
+    #
+    # signed in user
+    #
+    unless user.blank?
+
+      if user.profile && user.profile.manager?
+        can :manage, :all
+      end
+
+      can [ :show ], Gallery do |gallery|
+        gallery.user == user
+      end
+      
+    end
     user ||= User.new
+    
+    can [ :read ], Gallery do |gallery|
+      gallery.is_public
+    end
 
-    if user.profile && user.profile.manager?
-      can :manage, :all
-    else
-      can :read, :all
+    can [ :read ], Report do |report|
+      report.is_public
     end
+    
   end
 end

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

@@ -1,14 +1,17 @@
 
-%hr
-%ul
-  %li ^__^
-  - if current_user
-    %li
-      >[ #{current_user.email} ]<
-      %div{ :style => 'float: left' }= button_to '[x]', main_app.destroy_user_session_path, :method => :delete
-  - else
-    %li
-      Please log in
-      = link_to '[+]', main_app.new_user_session_path
-
+.container
+  %br
+  .row
+    .col-sm-6
+      - if current_user
+        >[ #{current_user.email} ]<
+        = button_to '[x]', main_app.destroy_user_session_path, :method => :delete
+      - else
+        Please log in
+        = link_to '[+]', main_app.new_user_session_path
 
+    .col-sm-6
+      %br
+      \~__^
+      %br
+      %br

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

@@ -1,8 +1,8 @@
-%br
 
+%br
 .container
   .row
-    .col-12-xs
+    .col-sm-12
       %ul.nav.nav-pills
         %li= link_to 'Cities',    cities_path
         %li= link_to 'Events',    events_path

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

@@ -1,46 +1,39 @@
 
-- url ||= manager_galleries_path
+- url ||= galleries_path
 
 = form_for gallery, :url => url do |f|
   .row
-    .large-12.columns
+    .col-sm-12
       = f.label :name
       = f.text_field :name
       = gallery.galleryname
-      %br
-      %br
+      = f.submit
       
   .row
-    .large-4.columns
+    .col-sm-4
       = f.label :site
       = select :gallery, :site_id, @sites_list
-    .large-4.columns
+    .col-sm-4
       = f.label :city
       = select :gallery, :city_id, @cities_list
-    .large-4.columns
-      = f.label :tag
-      = select :gallery, :tag_id, @tags_list
-    .large-4.columns
-      = f.label :user
-      = select :gallery, :user_id, @users_list
-    .large-4.columns.end
+    .col-sm-4
       = f.label :venue
       = select :gallery, :venue_id, @venues_list
-
+    .col-sm-4
+      = f.label :user_proifle
+      = select :user_profile, :user_profile_id, @user_profiles_list
+      
   .row
-    .large-3.columns
+    .col-sm-3
       = f.label :is_public
       = f.check_box :is_public
-    .large-3.columns
+    .col-sm-3
       = f.label :is_done
       = f.check_box :is_done
-    .large-3.columns
+    .col-sm-3
       = f.label :is_trash
       = f.check_box :is_trash
-    .large-3.columns
+    .col-sm-3
       = f.label :is_feature
       = f.check_box :is_feature    
-  
-  .row
-    .large-3.columns.end
-      = f.submit
+

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

@@ -6,7 +6,7 @@
     - galleries.each do |g|
       .item
         %h3
-          = link_to '[~]', edit_gallery_path( g.galleryname )
+          = link_to '[~]', edit_gallery_path( g )
           = link_to g.name, gallery_path(g.galleryname)
         -# = render 'meta', :item => g
         - if g.photos.length == 0

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

@@ -4,10 +4,7 @@
     .large-12.columns
       - if gallery.site
         Site #{link_to "http://#{gallery.site.domain}/#{gallery.site.lang}", site_path(gallery.site)}
-      - if gallery.user
-        User #{link_to gallery.user.username, user_path(gallery.user)}
-      - if gallery.tag
-        Tag #{link_to gallery.tag.name, tag_path(gallery.tag)}
+        User :: #{gallery.username ? gallery.username.inspect : '<no-user>' }
       - if gallery.city
         City #{link_to gallery.city.name, city_path(gallery.city)}
       - if gallery.venue

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

@@ -1,12 +1,13 @@
 
 - #
-- # manager / galleries / _thumbs
+- # ish_manager / galleries / _thumbs
 - #
 
 %hr
-.manager-galleries--thumbs
-  .row
-    .large-12.columns
-      - gallery.photos.each do |photo|
-        = image_tag photo.photo.url( :thumb )
+.row
+  - gallery.photos.each do |photo|
+    .col-xs-6.col-sm-6.col-md-4.col-lg-2
+      %br
+      = button_to '[x]', photo_path( photo ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+      .thumb= image_tag( photo.photo.url( :thumb ), :alt => '' )
 %hr

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

@@ -1,17 +1,10 @@
 
-.title
-  %h5
-    .btn-group
-      %a{ 'data-toggle' => 'dropdown', :class => 'btn dropdown-toggle' }
-        = t('galleries.list')
-        %span.caret
-      %ul.dropdown-menu
-        %li= link_to 'Add New', new_manager_gallery_path
-        %li= link_to 'Public', :action => :index, :public => '1'
-        %li= link_to 'Nonpublic', :action => :index, :public => '0'
-        %li= link_to 'Done', :action => :index, :done => '1'
-        %li= link_to 'Nondone', :action => :index, :done => '0'
-        %li= link_to 'Trash', :action => :index, :is_trash => '1'
-        %li= link_to 'Fullindex', manager_galleries_fullindex_path
-        %li= link_to 'Paginated', manager_galleries_path
-        %li= link_to 'Short List', :action => :index, :short_list => true
+.row
+  .col-xs-12
+    .center
+      %h2
+        #{gallery.name} (#{gallery.photos.length})
+        = link_to '[~]', edit_gallery_path( gallery )
+        [x]
+      galleryname :: #{gallery.galleryname}
+      = render 'meta', :gallery => gallery

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

@@ -1,11 +1,5 @@
 
-.row
-  .large-12.columns
-    %h1
-      = t('galleries.edit')
-      = link_to @gallery.name, manager_gallery_path( @gallery )
-      (#{@gallery.photos.count})
-    
-= render 'manager/galleries/form', :gallery => @gallery, :url => manager_gallery_path( @gallery )
-= render 'manager/galleries/thumbs', :gallery => @gallery
-= render 'manager/photos/multinew', :gallery => @gallery
+= render 'title', :gallery => @gallery    
+= render 'form', :gallery => @gallery, :url => gallery_path( @gallery )
+= render 'thumbs', :gallery => @gallery
+= render 'ish_manager/photos/multinew', :gallery => @gallery

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

@@ -7,12 +7,12 @@
 
 .container
   .row
-    .col-xs-6
+    .col-sm-6
       %h4
-        = t('galleries.list')
+        Galleries (#{Gallery.count})
         = link_to '[+]', new_gallery_path
-    .col-xs-6= render 'search'
+    .col-sm-6= render 'search'
   .row
-    .lcol-xs-12
+    .col-sm-12
       -# = render 'ish_manager/galleries/menu_secondary'
       = render 'ish_manager/galleries/list', :galleries => @galleries

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

@@ -4,4 +4,4 @@
     %h3 New Gallery
     = flash[:error]
     
-= render 'manager/galleries/form', :gallery => @gallery
+= render 'form', :gallery => @gallery

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

@@ -1,14 +1,5 @@
 
-.row
-  .col-xs-12
-    .center
-      Gallery
-      %h2
-        #{@gallery.name} (#{@photos.length})
-        = link_to '[~]', edit_gallery_path( @gallery )
-        [x]
-      = @gallery.galleryname
-      = render 'meta', :gallery => @gallery
+= render 'title', :gallery => @gallery
 
 .row
   %ul

data/app/views/ish_manager/photos/_multinew.haml

@@ -3,21 +3,5 @@
   .row
     .small-12.columns
       %h3.center Add Photos
-      %ul{ :id => 'photos', :class => 'thumbnails', 'data-json-url' => manager_j_gallery_path( gallery.id ) }
-      %input{ :id => 'fileupload', :type => 'file', :name => 'photo[photo]', 'data-url' => manager_photos_multiadd_path( gallery.galleryname ), :multiple => '' }
-      
-%script{:src => "//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"}
-%script{:src => "/js/jquery.ui.widget.js"}
-%script{:src => "/js/jquery.iframe-transport.js"}
-%script{:src => "/js/jquery.fileupload.js"}
-:javascript
-  $(function () {
-      $('#fileupload').fileupload({
-          dataType: 'json',
-          done: function (e, data) {
-              $.each(data.result.files, function (index, file) {
-                  $('<p/>').text(file.name).appendTo(document.body);
-              });
-          }
-      });
-  });
+      %ul{ :id => 'photos', :class => 'thumbnails' }
+      %input{ :id => 'fileupload', :type => 'file', :name => 'photo[photo]', 'data-url' => gallery_multiadd_path( gallery.galleryname ), :multiple => '' }

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

@@ -3,12 +3,16 @@
   %head
     %title Ish manager
     = stylesheet_link_tag    "ish_manager/application", media: "all"
+    %script{ :src => "https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js" }
     = javascript_include_tag "ish_manager/application"
     = csrf_meta_tags
   %body
-    = render :partial => 'ish_manager/application/main_header'
-    %p.notice= notice
-    %p.alert= alert
-    .container
-      = yield
+    .bg-white
+      = render :partial => 'ish_manager/application/main_header'
+      - if notice
+        %p.notice= notice
+      - if alert
+        %p.alert= alert
+      .container
+        = yield
     = render :partial => 'ish_manager/application/main_footer'