ish_manager 0.1.8.50 → 0.1.8.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a1f42a1466bab0848934b4b987ae88f69f11e66
-  data.tar.gz: c6ba50c3f59da1c1bb0075492d9630b9835c6d09
+  metadata.gz: 618fe86245ca25daaaa69aa91094bdd95aae23ef
+  data.tar.gz: 04a017790df0e7f90172eb1fb5c4de2a82a5abb1
 SHA512:
-  metadata.gz: 584fbba4f53c6e91a20b0aec9d41b934ce9f1bf7ed99dcc1885431cdb866588e53d6fa7104b58f5feba30c373e4367d30c785c4b1cf99c9c6be9ae078db54e0f
-  data.tar.gz: fd2d566adbf9cecc79c235566b4e0e8f99ae6aab41eb5ff24d8a37fc98b9aa97f1925168308d99d01487dbc937e287e5d5cfde50002ec02620aa8b086a7ed565
+  metadata.gz: 2a98823084c92a427f57b180527270fe089a9f29ace65ced4a93e62c4a9e2e72baac380da8a7018ebe4d847f20ef837d7937b70ec1fd020a4b8087d38430f0a2
+  data.tar.gz: 7387f0160e625e4a0fc2e18338adbc66c21a1803d7909294e7d63a751a08368ee54ad3a99f57605be737ca7ebd50c86d959af0726b6c77393b18e763d0d480a0

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

@@ -97,8 +97,9 @@ nav.pagination
 /**
  * reports
  */
-.descr {
-  border: 1px solid yellow;
+.descr,
+.description {
+  border: 1px solid red;
   padding: 1em;
 }
 .descr .float-left {

data/app/controllers/ish_manager/application_controller.rb

@@ -32,5 +32,10 @@ module IshManager
       err
     end
 
+    def puts! a, b=''
+      puts "+++ +++ #{b}"
+      puts a.inspect
+    end
+
   end
 end

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -25,7 +25,11 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     else
       flash[:alert] = "Cannot update profile: #{pp_errors @profile.errors.messages}"
     end
-    redirect_to :action => :index
+    if params[:redirect_to]
+      redirect_to params[:redirect_to]
+    else
+      redirect_to :action => :index
+    end
   end
 
 end

data/app/controllers/ish_manager/videos_controller.rb

@@ -5,7 +5,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   
   def index
     authorize! :index, Video.new
-    @videos = Video.unscoped
+    @videos = Video.unscoped.order_by( :created_at => :desc )
 
     if params[:city_id]
       city = City.find params[:city_id]

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

@@ -1,5 +1,7 @@
 
 .meta
+  On #{item.created_at.to_s[0...10]}
+  %br
   - if item.city
     <b>City:</b> #{link_to item.city.name, city_path( item.city )}
     %br

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

@@ -8,16 +8,43 @@
       Videos (#{videos.count})
       = link_to '[+]', new_video_path
 
-    = paginate videos, :param_name => :videos_page
-    %ol
-      - videos.each do |video|
-        %li
-          = button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-          = link_to '[~]', edit_video_path( video )
-          = link_to video.name, video_path( video )
-          = render 'meta', :item => video
-          -# = render 'embed', :video => video
-          = image_tag "https://img.youtube.com/vi/#{video.youtube_id}/0.jpg"
-    = paginate videos, :param_name => :videos_page
+    - if @current_user.profile.videos_embed
+      Embed?
+      .inline
+        = form_tag user_profile_path( @current_user.profile ), :method => :patch do 
+          = hidden_field_tag 'ish_models_user_profile[videos_embed]', false
+          = hidden_field_tag 'redirect_to', videos_path
+          = submit_tag 'Preview?'
+    - else
+      .inline
+        = form_tag user_profile_path( @current_user.profile ), :method => :patch do
+          = hidden_field_tag 'ish_models_user_profile[videos_embed]', true
+          = hidden_field_tag 'redirect_to', videos_path
+          = submit_tag 'Embed?'
+      Preview?
+
+    %br
+    
+    = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
+    
+    - videos.each do |video|
+      .panel
+        .panel-content
+          .row
+            .col-xs-12.col-sm-6
+              .center
+                = 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
+                .description= video.description
+            .col-xs-12.col-sm-6
+              .center
+                - if @current_user.profile.videos_embed
+                  = render 'embed', :video => video
+                - else
+                  = render 'preview', :video => video
+        
+    = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'
 %hr
 

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

@@ -0,0 +1,2 @@
+
+= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/0.jpg", :style => "width: 100%"

data/app/views/ish_manager/videos/_preview.haml~

@@ -0,0 +1,2 @@
+
+= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/0.jpg", :style => { :width => '100%' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.50
+  version: 0.1.8.51
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -287,6 +287,8 @@ files:
 - app/views/ish_manager/videos/_index.haml
 - app/views/ish_manager/videos/_list.haml
 - app/views/ish_manager/videos/_list_small.haml
+- app/views/ish_manager/videos/_preview.haml
+- app/views/ish_manager/videos/_preview.haml~
 - app/views/ish_manager/videos/edit.haml
 - app/views/ish_manager/videos/index.haml
 - app/views/ish_manager/videos/index.haml~