ish_manager 0.1.8.251 → 0.1.8.255

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

@@ -1,3 +1,6 @@
+-#
+-# ish_manager / sites / _header
+-#
 
 - site ||= @site
 
@@ -6,11 +9,13 @@
     Site http://#{site.domain}/#{site.lang}
     = link_to image_edit, edit_site_path( site.id )
 
-  %ul.nav.nav-pills
-    %li= link_to "Features (#{site.features.length})", site_features_path( site.id )
+  %ul.inline
+    %li
+      = link_to "Features (#{site.features.length})", site_features_path( site.id )
+      = link_to "[+]", new_site_feature_path( site.id )
     %li= link_to "Newsitems (#{site.newsitems.length})", site_newsitems_path( site.id )
     %li= link_to "Reports (#{site.reports.length})", site_reports_path( site.id )
     %li= link_to "Galleries (#{site.galleries.length})", site_galleries_path( site.id )
     %li= link_to "Videos (#{site.videos.length})", site_videos_path( site.id )
     %li= link_to "Tags (#{site.tags.length})", site_tags_path( site.id )
-    
+

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

@@ -11,7 +11,7 @@
 
 .container
   .row
-    .col-sm-12
+    .col.s12
       %h4
         Galleries (#{@galleries.count})
         = link_to image_new, new_gallery_path

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

@@ -9,7 +9,7 @@
     - counter = 0
     - @site_groups.each do |domain, sites|
       - counter +=1 
-      .col-xs-12{ :class => "col-sm-#{12/per_row}" }
+      .col.s12{ :class => "col.s#{12/per_row}" }
         .panel.panel-primary
           .panel-body
             - sites.each_with_index do |site, idx|

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

@@ -5,14 +5,14 @@
   -# = render 'ish_manager/newsitems/index', :newsitems => @newsitems.limit(@site.n_newsitems), :site => @site
       
   .row
-    .col-sm-6
+    .col.s6
       = render 'ish_manager/galleries/index_title', :galleries => @galleries
-    .col-sm-6
+    .col.s6
       = render 'ish_manager/reports/index', :reports => @reports, :site => @site
 
   .row
-    .col-sm-6
+    .col.s6
       = render 'ish_manager/videos/index_title', :videos => @videos
-    .col-sm-6
+    .col.s6
       = render 'ish_manager/tags/index', :tags => @tags
 

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

@@ -22,4 +22,4 @@
     = f.number_field :price, :step => 0.01, :placeholder => "0.01"
   .form-group
     = f.submit ">", :class => %w(btn blue)
-  .c
+  .c

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

@@ -7,6 +7,6 @@
   .items
     - feature_tags.each do |tag|
       .item
-        %h3= link_to tag['name_'+@locale.to_s], tag_path(tag.name_seo)
+        %h3= link_to tag['name_'+@locale.to_s], tag_path(tag.slug)
 
-  .c
+  .c

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

@@ -5,37 +5,33 @@
 
 = form_for @tag do |f|
   .row
-    .col-xs-12.col-md-6
+    .col.s12.m6
       .input-field
         = f.label :name
         = f.text_field :name
-        
-    .col-xs-12.col-md-6
-      .input-field
-        = f.text_field :name_seo
-        = f.label :name_seo
-  .row      
-    .col-xs-12.col-md-6
+
+  .row
+    .col.s12.col.m6
       .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 
+    .col.s12.m6
+      .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 
+    .col.s12.m6
+      .input-field
         = f.select :site, options_for_select( @sites_list, :selected => @tag.site_id )
         = f.label "site"
-  .row      
-    .col-xs-12.col-md-3
+  .row
+    .col.s12.m3
       = f.check_box :is_public
       = f.label :is_public
-    .col-xs-12.col-md-3
+    .col.s12.m3
       = f.check_box :is_feature
       = f.label :is_feature
-    .col-xs-12.col-md-3
+    .col.s12.m3
       = f.check_box :is_trash
       = f.label :is_trash
   .row

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

@@ -5,4 +5,4 @@
       .title
         %h3= t('tags.list')
       - tags.each do |tag|
-        .item= link_to tag['name_'+@locale.to_s], tag_path(tag.name_seo)
+        .item= link_to tag['name_'+@locale.to_s], tag_path(tag.slug)

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

@@ -2,4 +2,4 @@
 .list--simple
   %ul.block
     - tags.each do |tag|
-      %li= link_to tag.name, tag_path(tag.name_seo)
+      %li= link_to tag.name, tag_path(tag.slug)

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

@@ -0,0 +1,9 @@
+-#
+-# ish_manager / tags / _meta
+-#
+
+%h5.center
+  Tag
+  = tag.name
+  = link_to image_edit, edit_tag_path( tag )
+  .inline= button_to 'X', tag_path( tag ), :method => :delete, :data => { :confirm => 'Are you sure?' }

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

@@ -1,4 +1,4 @@
 
 %h3
-  Edit Tag #{link_to @tag.name, tag_path(@tag)}
+  Edit Tag #{link_to @tag.name, tag_path(@tag)} (#{@tag.slug})
 = render 'form', :tag => @tag

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

@@ -5,28 +5,24 @@
   Tag #{@tag.name}
 
 .row
-  .col-sm-12
-    %h5.center
-      Tag
-      = @tag.name
-      = link_to image_edit, edit_tag_path( @tag )
-      .inline= button_to 'X', tag_path( @tag ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-    -# .descr= @tag.descr # I don't wanna show this every time to everyone, they know what they are here for.
-    -# = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features]
+  .col.s12
+    = render 'meta', tag: @tag
+    .descr= @tag.descr # I don't wanna show this every time to everyone, they know what they are here for.
+    = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features], resource: @tag
 
 - proc do # nothing
   .row
-    .col-sm-12
+    .col.s12
       = render 'ish_manager/newsitems/index', :newsitems => @tag.newsitems, :resource => @tag, :tag => @tag
 
 .row
-  .col-sm-12
+  .col.s12
     = render 'ish_manager/reports/index', :reports => @tag.reports, :n_ads => 0
 
 .row
-  .col-sm-12
+  .col.s12
     = render 'ish_manager/galleries/index_title', :galleries => @galleries, :n_thumbs => 4
 
 .row
-  .col-sm-12
+  .col.s12
     = render 'ish_manager/videos/index_title', :videos => @videos

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

@@ -1,34 +1,47 @@
+-#
+-# ish_manager / user_profiles / _form
+-#
 
 - url = profile.persisted? ? profile_path( profile.id ) : profiles_path
 
-= form_for profile, :as => :profile, :url => url do |f|
-  .input-field
-    %label name
-    = f.text_field :name
-
-  .input-field
-    %label email
-    = f.text_field :email
-
-  .input-field
-    = f.select :role_name, options_for_select( [[nil, nil]] + IshModels::UserProfile::ROLES.map { |r| [ r, r ] }, :selected => profile.role_name )
-    %label role name
-
-  .input-field
-    = f.select :current_city, options_for_select( @cities_list, :selected => profile.current_city_id )
-    %label City
-
-  .input-field
-    = f.label :fb_access_token
-    = f.text_field :fb_access_token
-  .input-field
-    = f.label :fb_long_access_token
-    = f.text_field :fb_long_access_token
-
-  .input-field
-    = f.label :bookmarked_location_ids
-    = f.select :bookmarked_location_ids, @locations_list, {}, { multiple: true }
-
-  = f.submit 'Save', :class => %w(button)
+.row
+  .col.s6
+    = form_for profile, :html => { :multipart => true }, :as => :profile, :url => url do |f|
+      .input-field
+        %label name
+        = f.text_field :name
+
+      .input-field
+        %label email
+        = f.text_field :email
+
+      .input-field
+        %label Change profile pic
+        %br
+        = file_field_tag :photo
+        = image_tag profile.profile_photo.photo.url(:thumb) rescue nil
+        %br
+        %br
+
+      .input-field
+        = f.select :role_name, options_for_select( [[nil, nil]] + IshModels::UserProfile::ROLES.map { |r| [ r, r ] }, :selected => profile.role_name )
+        %label role name
+
+      .input-field
+        = f.select :current_city, options_for_select( @cities_list, :selected => profile.current_city_id )
+        %label City
+
+      .input-field
+        = f.label :fb_access_token
+        = f.text_field :fb_access_token
+      .input-field
+        = f.label :fb_long_access_token
+        = f.text_field :fb_long_access_token
+
+      .input-field
+        = f.select :bookmarked_location_ids, options_for_select( @locations_list, selected: profile.bookmarked_location_ids), {}, { multiple: true }
+        %label Bookmarked Locations
+
+      = f.submit 'Save', :class => %w(button)
 
 

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

@@ -1,3 +1,6 @@
+-#
+-# ish_manager / user_profiles / index
+-#
 
 %h5
   User Profiles (#{@user_profiles.count})
@@ -8,7 +11,7 @@
   .panel
     .panel-body
       .row
-        .col-sm-4
+        .col.s4
           %ul
             %li
               <b>Email:</b> #{link_to profile.email, user_profile_path(profile)}
@@ -17,10 +20,15 @@
             %li <b>Role:</b> #{profile.role_name}
             %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
             %li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
-        .col-sm-8
+            %li
+              <b>Profile Photo:</b>
+              = image_tag profile.profile_photo.photo.url(:thumb) rescue nil
+            %li <b>Address:</b> #{profile.addresses[0].inspect}
+
+        .col.s8
           %h5 Shared galleries
           - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|
-            &gt; #{link_to g.name, gallery_path(g.galleryname)} <br />
+            &gt; #{link_to g.name, gallery_path(g.slug)} <br />
             = render 'meta', :item => g
           <hr />
 
@@ -29,13 +37,10 @@
             = render 'ish_manager/newsitems/item', n: n, profile_id: profile.id
           <hr />
 
-          %h5 Bookmarked Locations
-          %ul
+          %h5 Bookmarked Locations (#{profile.bookmarked_locations.length})
+          %ul.browser-default
             - profile.bookmarked_locations.each do |n|
               %li
-                = n.id
-                = n.inspect
+                = n.slug
+
 
-      .row
-        Address:
-        = profile.addresses[0].inspect

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

@@ -1,6 +1,6 @@
 %p Creates user if one doesn't exist for the profile (or uses existing for wiring).
 
 .row
-  .col-xs-12.col-md-8.col-md-offset-2.col-lg-6.col-lg-offset-3
+  .col.s12.col.m8.col-md-offset-2.col-lg-6.col-lg-offset-3
     %h5 New Profile
     = render 'form', :profile => @profile

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

@@ -1,40 +1,43 @@
 
 = form_for venue, :html => { :multipart => true } do |f|
   .row
-    .col-sm-6
+    .col.s6
       = f.label :name
       = f.text_field :name
-    .col-sm-6
-      = f.label :name_seo
-      = f.text_field :name_seo
-      
+    .col.s6
+      = f.label :slug
+      = f.text_field :slug
+
   .row
-    .col-sm-6
+    .col.s6
       = f.label :subhead
       = f.text_area :subhead
-    .col-sm-6
+    .col.s6
       = render 'profile_pic', :resource => venue
-      
+
   .row
-    .col-sm-12
+    .col.s12
       = f.label :descr
       = f.text_area :descr, :class => [ :tinymce ]
 
   .row
-    .col-sm-6
+    .col.s6
       = f.label :city
       = f.select :city_id, options_for_select( @cities_list, :selected => venue.city_id )
-    .col-sm-6
+    .col.s6
       coords
       .row
-        .col-xs-6= f.text_field :x
-        .col-xs-6= f.text_field :y
+        .col.s6= f.text_field :x
+        .col.s6= f.text_field :y
 
   .row
-    .col-sm-6
+    .col.s6
       = f.label :tags
       = f.select :tag_ids, options_for_select( @tags_list, :selected => venue.tag_ids ), {}, { :multiple => true }
-      
+    .col.s6
+      = f.label :address
+      = f.text_field :address
+
   .row
-    .col-sm-12
+    .col.s12
       = f.submit

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

@@ -10,4 +10,4 @@
       %br
       .clearfix
 - if venues.respond_to? :total_pages
-  = paginate venues, :param_name => 'venues_page', :views_prefix => 'ish_manager'
+  = paginate venues, :param_name => 'venues_page', :views_prefix => 'ish_manager'

data/app/views/ish_manager/videos/_embed.erb

@@ -1,4 +1,4 @@
 
 <div class="video-embed">
   <iframe width="560" height="315" src="//www.youtube.com/embed/<%= video.youtube_id %>" frameborder="0" allowfullscreen></iframe>
-</div>
+</div>

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

@@ -3,7 +3,7 @@
   = render 'form_errors', :item => @video
 
   .row
-    .col-md-6
+    .col.m6
       .field
         = f.label :youtube_id
         = f.text_field :youtube_id
@@ -13,7 +13,7 @@
       .field
         = f.label :descr
         = f.text_field :descr
-    .col-md-6
+    .col.m6
       .field
         = f.label :video
         = f.file_field :video
@@ -27,23 +27,23 @@
         = f.label :city_id
         = select :video, :city_id, @cities_list
   .row
-    .col-sm-3
+    .col.s3
       = f.label :premium_tier
       = f.number_field :premium_tier
-    .col-sm-3
+    .col.s3
       = f.label :site
       = f.select :site_id, @sites_list
-    .col-sm-3
+    .col.s3
       = f.label :user_profile
       = f.select :user_profile_id, @user_profiles_list
   .row
-    .col-sm-4
+    .col.s4
       = f.check_box :is_public
       = f.label :is_public
-    .col-sm-4
+    .col.s4
       = f.check_box :is_trash
       = f.label :is_trash
-    .col-sm-4
+    .col.s4
       = f.check_box :is_feature
       = f.label :is_feature
 

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

@@ -1,33 +1,33 @@
 
 - videos ||= @videos
-.row
-  .col-sm-12
-    %h5
-      Videos (#{videos.count})
-      = link_to '[+]', new_video_path
-    %br
 
-    = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+.videos--index
 
+  %h5
+    Videos (#{videos.count})
+    = link_to '[+]', new_video_path
+
+  = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+
+  .row
     - videos.each do |video|
-      .panel
-        .panel-content
-          .row
-            .col-sm-6
-              .float-left
-                - if video.youtube_id.present?
-                  -## doesn't work with private videos, which are most
-                  -# .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
-                  = render 'ish_manager/videos/embed_mini', video: video
-                - else
-                  .thumb= image_tag video.thumb.url(:thumb)
-              .a
-                = link_to video.name, video_path( video )
-                .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-                = link_to '[~]', edit_video_path( video )
-              = render 'meta', :item => video
-              .c
+      .col.s6
+        .item.panel
+          .panel-content
+            .float-left
+              - if video.youtube_id.present?
+                -## doesn't work with private videos, which are most
+                -# .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
+                = render 'ish_manager/videos/embed_mini', video: video
+              - else
+                .thumb= image_tag video.thumb.url(:thumb)
+            .a
+              = link_to video.name, video_path( video )
+              .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+              = link_to '[~]', edit_video_path( video )
+            = render 'meta', :item => video
+            .c
 
-    = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+  = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
 %hr
 

data/app/views/ish_manager/videos/_index_title.haml

@@ -3,7 +3,7 @@
 -# videos = videos.page params[:videos_page]
 
 .row
-  .col-sm-12
+  .col.s12
     %h5
       Videos (#{videos.count})
       = link_to image_new, new_video_path
@@ -14,7 +14,7 @@
       .panel
         .panel-content
           .row
-            .col-xs-12
+            .col.s12
               .float-left= youtube_image_tag( video )
               .a
                 = link_to video.name, video_path( video )

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

@@ -27,7 +27,7 @@
       = render :partial => "ish_manager/application/main_header_#{role}"
       .container
         .row
-          .col-sm-12
+          .col.s12
             - if notice
               %p.notice= notice
             - if alert

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

@@ -22,7 +22,7 @@
       = render :partial => "ish_manager/application/main_header_#{role}"
       .container
         .row
-          .col-sm-12
+          .col.s12
             - if notice
               %p.notice= notice
             - if alert
@@ -30,4 +30,4 @@
       .container
         = yield
     = render :partial => 'ish_manager/application/main_footer'
-    = render 'debug' if Rails.env.development?
+    = render 'debug' if Rails.env.development?

data/config/routes.rb

@@ -20,7 +20,7 @@ IshManager::Engine.routes.draw do
   resources :email_templates
   resources :events
 
-  resources :feature
+  resources :features
   resources :friends
 
   get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }

data/lib/ish_manager.rb

@@ -10,4 +10,4 @@ module IshManager
 
   module Gameui
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.251
+  version: 0.1.8.255
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -177,7 +177,7 @@ files:
 - app/assets/javascripts/ish_manager/maps.js
 - app/assets/javascripts/ish_manager/materialize.js
 - app/assets/javascripts/ish_manager/shared.js
-- app/assets/stylesheets/ish_manager/application.css
+- app/assets/stylesheets/ish_manager/application.scss
 - app/assets/stylesheets/ish_manager/bootstrap.css
 - app/assets/stylesheets/ish_manager/galleries.scss
 - app/assets/stylesheets/ish_manager/jquery-ui.css
@@ -190,6 +190,7 @@ files:
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
 - app/assets/stylesheets/ish_manager/user_profiles.scss
 - app/assets/stylesheets/ish_manager/utils.scss
+- app/assets/stylesheets/ish_manager/videos.scss
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/campaigns_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
@@ -258,6 +259,7 @@ files:
 - app/views/ish_manager/events/new.haml
 - app/views/ish_manager/features/_form.haml
 - app/views/ish_manager/features/_index.haml
+- app/views/ish_manager/features/_index.haml-trash
 - app/views/ish_manager/features/_item.haml
 - app/views/ish_manager/features/edit.haml
 - app/views/ish_manager/features/index.haml
@@ -291,6 +293,7 @@ files:
 - app/views/ish_manager/leads/index.haml
 - app/views/ish_manager/leads/new.haml
 - app/views/ish_manager/maps/_form.haml
+- app/views/ish_manager/maps/_index_item.haml
 - app/views/ish_manager/maps/_map_meta_row.haml
 - app/views/ish_manager/maps/edit.haml
 - app/views/ish_manager/maps/index.haml
@@ -339,6 +342,7 @@ files:
 - app/views/ish_manager/tags/_item.haml
 - app/views/ish_manager/tags/_list.haml
 - app/views/ish_manager/tags/_list_simple.haml
+- app/views/ish_manager/tags/_meta.haml
 - app/views/ish_manager/tags/edit.haml
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml