ish_manager 0.1.8.278 → 0.1.8.279

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea88d9378fd171766a3dfd996a631f5a92d28880018fcc52bca01aed7d7d2b2
-  data.tar.gz: f4ae443eb6d4ff99e7242b11205121fa93111db2e3666602e227480a3156844a
+  metadata.gz: 5752af378c30ba802cffc2bf97691555c43792e1882b1999f3673af0c9eb86cf
+  data.tar.gz: c433e153fb732cfd0c9826ab711b73be0e99d18a198fb8ba4dea4b33d8c09fbc
 SHA512:
-  metadata.gz: 487c21d056637ed963ca9bf71e11540fb083eb528a78c477ccaa718e0c5acf3c40b23e229d5c2668a62dc4403151de0447523facfb76c83a670c2a5e3d22aa99
-  data.tar.gz: 779c28a83610c15f69cb44111258d27ecb6200e338f5c20cd95471b7c37805bb25121b2a3e5b00f8846ed3153793a5f02f8d5283894ae58152ccfa2dbab4bd63
+  metadata.gz: c1719b020d95788eacfcc5cccdca47a317a7fe67dd6d7fbd4317c2ad6fbe3c9cdcde6fe82df6a253c6c914ef8c6f2d35acc89a2076de69575fca35a63b8a859f
+  data.tar.gz: ec2d707acb1aa2d9b80aff4612be303d79a12f336eee5238ea898d06a5036b77e208865c6adef090bfa375f056539e5eba240a9946a191c471d5fe3cd9fa65c3

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

@@ -58,23 +58,6 @@ ul:not(.browser-default).bullets, {
 }
 
 
-.flat-row {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-content: flex-start;
-
-  height: 2.4em;
-  line-height: 3em;
-
-  width: 100%;
-  margin: 1em 0 0 0;
-  padding: 0;
-
-  > * {
-    padding-right: 1em;
-  }
-}
 
 
 /* A */
@@ -130,9 +113,28 @@ ul:not(.browser-default).bullets, {
 /* E */
 /* F */
 
+.flat-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-content: flex-start;
+
+  height: 2.4em;
+  line-height: 3em;
+
+  width: 100%;
+  margin: 1em 0 0 0;
+  padding: 0;
+
+  > * {
+    padding-right: 1em;
+  }
+}
+
+
 .flex-row {
   display: flex;
-  flex-wrap: wrap;
+  flex-wrap: wrap; /* @TODO: why does it wrap? in ish_manager/show , I'd prefer it didn't. */
 }
 
 .float-left {
@@ -172,14 +174,6 @@ textarea.large {
 
 /* M */
 
-.menu-secondary li {
-  display: inline;
-}
-.menu-secondary li a {
-  padding: 1rem;
-  background: white;
-}
-
 
 .manager--main-header {
   background: url('/assets/bg/weather.png');
@@ -217,6 +211,16 @@ textarea.large {
   border-bottom: 1px solid red;
 }
 
+.menu-secondary li {
+  display: inline;
+}
+.menu-secondary li a {
+  padding: 1rem;
+  background: white;
+}
+.meta-edit {
+  display: inline;
+}
 
 /* P */
 .panel-content {

data/app/assets/stylesheets/ish_manager/videos.scss

@@ -1 +1,26 @@
 
+.ish_manager-videos-show {
+  border-bottom: 2px solid red;
+  margin: 0 auto;
+  padding-bottom: .8em;
+  width: 640px;
+
+
+  .title {
+    font-size: 1.4em;
+    margin-left: .2em;
+  }
+
+  .row {
+    display: flex;
+    margin: 0;
+
+    img {
+      margin-right: .8em;
+      width: 100px;
+      height: 100px;
+    }
+  }
+
+
+}

data/app/controllers/ish_manager/videos_controller.rb

@@ -34,7 +34,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   def destroy
     @video = Video.unscoped.find params[:id]
     authorize! :destroy, @video
-    flag = @video.update_attributes( :is_trash => true )
+    flag = @video.delete
     @video.city.touch if @video.city
     @video.site.touch if @video.site
     @video.tags.map &:touch
@@ -91,7 +91,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   end
 
   def show
-    @video = Video.where( :youtube_id => params[:youtube_id] ).first
+    @video = Video.unscoped.where( :youtube_id => params[:youtube_id] ).first
     @video ||= Video.unscoped.find params[:id]
     authorize! :show, @video
 

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

@@ -0,0 +1,5 @@
+
+- if !video.youtube_id.blank?
+  = render 'embed_youtube', video: video
+- else
+  = render 'embed_s3', video: video

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

@@ -0,0 +1,6 @@
+
+<div class="" style="" >
+  <!-- <iframe width="430" height="322" src="<%= video.video.url %>" frameborder="0" allowfullscreen></iframe> -->
+  <iframe width="640" height="480" src="<%= video.video.url %>" frameborder="0" allowfullscreen></iframe>
+  <!-- <iframe src="<%= video.video.url %>" frameborder="0" allowfullscreen></iframe> -->
+</div>

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

@@ -23,9 +23,8 @@
                 .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
+            = render 'meta_edit', item: video
+            = render 'meta', item: video
             .c
 
   = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'

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

@@ -0,0 +1,4 @@
+
+.meta-edit
+  .inline= button_to '[x]', video_path( item ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+  = link_to '[~]', edit_video_path( item )

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

@@ -2,19 +2,18 @@
 - content_for :title do
   #{@video.name} | #{@site ? @site.title : ''}
 
-.row
-  .large-12.columns
+.ish_manager-videos-show
+  = link_to '[Back]', videos_path
 
-    %h3
-      - if @video.name.blank?
-        = t('videos.no_title')
-      - else
-        = @video.name
-    = render 'ish_manager/application/meta', :item => @video
-    .text-center= render 'embed', :video => @video
-    %hr
-    = link_to @video.video.url, @video.video.url
+  = render 'embed', :video => @video
+
+  .row
+    = image_tag @video.thumb.url(:thumb)
+    .a
+      .title
+        = @video.name.blank? ? t('videos.no_title') : @video.name
+      .flex-row
+        = render 'meta_edit', item: @video
+        = render 'ish_manager/application/meta', :item => @video
+        = link_to @video.video_file_name, @video.video.url
 
-    %p <b>User Profile:</b> #{@video.user_profile.name}
-    %p= image_tag @video.thumb.url(:thumb)
-    %p <b>Video:</b> #{@video.inspect}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.278
+  version: 0.1.8.279
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -355,14 +355,17 @@ files:
 - app/views/ish_manager/venues/index.haml
 - app/views/ish_manager/venues/new.haml
 - app/views/ish_manager/venues/show.haml
-- app/views/ish_manager/videos/_embed.erb
+- app/views/ish_manager/videos/_embed.haml
 - app/views/ish_manager/videos/_embed_half.erb
 - app/views/ish_manager/videos/_embed_mini.erb
+- app/views/ish_manager/videos/_embed_s3.erb
+- app/views/ish_manager/videos/_embed_youtube.erb
 - app/views/ish_manager/videos/_form.haml
 - app/views/ish_manager/videos/_index.haml
 - app/views/ish_manager/videos/_index_title.haml
 - app/views/ish_manager/videos/_list.haml
 - app/views/ish_manager/videos/_list_small.haml
+- app/views/ish_manager/videos/_meta_edit.haml
 - app/views/ish_manager/videos/_preview.haml
 - app/views/ish_manager/videos/edit.haml
 - app/views/ish_manager/videos/index.haml