ish_manager 0.1.8.46 → 0.1.8.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 354913c6726225ce2e17f2d5daedf5f7192a71ff
-  data.tar.gz: c5214eadaec6ce76e7e76ba422b7535db13f941c
+  metadata.gz: 3ebd11be877c4582e3aef3eb253b561b98179fd7
+  data.tar.gz: 1fe3f9d000153ecdbd0c3b5390c8202edc7950bf
 SHA512:
-  metadata.gz: eceb6bc0a16c47b92de430f97353f4e29901d86878191325a0052cdc40dfd86a3bbe94de9516c6fa0be15d2edfab7b79bf36e13218e6bb5b5f165d7eb7165633
-  data.tar.gz: 21ebbd5f3ab16eb02e0274b57878e01dd1cf81f8fed88401ff11c25387f9b3b20bbe302961bca21d06b793d639dba29fdb58a5e70cbcfa099ec02246fb495943
+  metadata.gz: 2c7a2ef99aa88e236d87830b4f95e81f4529bc7332248d1804e1385bdf5bf3579fbb99e7d53051f4634f8d05027c3b7a57f53691a7586b6cf9b9c29ce00844d5
+  data.tar.gz: 536e344c0b5146a5d81624a2942357f8034bab8a88d05846ef40b61c76514b1852b12b7b0f1bafda4b3c4526e022664915e3fb11e5b1b61215efbb73f4bfd559

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

@@ -15,6 +15,10 @@
  *= require_self
  */
 
+
+/**
+ * utils
+ */
 .bg-white {
   background: url('/assets/bg/confectionary.png');
   padding-bottom: 1em;
@@ -27,6 +31,11 @@ body {
 .center {
   text-align: center;
 }
+
+.inline {
+  display: inline-block;
+}
+
 .notice {
   border: 1px solid green;
   padding: .8em;
@@ -94,4 +103,11 @@ nav.pagination
 }
 .descr .float-left {
   padding-right: 1em;
-}
+}
+
+/**
+ * tags
+ */
+ul.tags ul.tags {
+  margin-left: 2em;
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -23,7 +23,7 @@ module IshManager
       @galleries_list = Gallery.all.list
       @videos_list = Video.all.list
       @user_profiles_list = IshModels::UserProfile.all.list
-      @tags_list = Tag.all.list
+      @tags_list = Tag.list
     end
 
     private

data/app/controllers/ish_manager/tags_controller.rb

@@ -4,7 +4,7 @@ class IshManager::TagsController < IshManager::ApplicationController
   before_action :set_lists
 
   def index
-    @tags = Tag.unscoped
+    @tags = Tag.unscoped.where( :parent_tag_id => nil ).order_by( :name => :asc )
     authorize! :index, Tag.new
   end
   
@@ -39,6 +39,9 @@ class IshManager::TagsController < IshManager::ApplicationController
   def update
     @tag = Tag.unscoped.find params[:id]
     authorize! :update, @tag
+    
+    # byebug
+
     if @tag.update_attributes params[:tag].permit!
       flash[:notice] = 'Success.'
       redirect_to tags_path
@@ -47,7 +50,18 @@ class IshManager::TagsController < IshManager::ApplicationController
       render :action => :new
     end
   end
-  
+
+  def destroy
+    @tag = Tag.unscoped.find params[:id]
+    authorize! :destroy, @tag
+    if @tag.destroy
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = "Cannot destroy tag: #{@tag.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
 end
 
 

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

@@ -11,6 +11,7 @@
           %li= link_to 'Profiles',  user_profiles_path
           %li= link_to 'Reports',   reports_path
           %li= link_to 'Sites',     sites_path
+          %li= link_to 'Tags',      tags_path
           %li= link_to 'Venues',    venues_path
           %li= link_to 'Videos',    videos_path
           %li= link_to 'Users',     user_profiles_path

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

@@ -2,18 +2,28 @@
 -#
 -# tags / _form
 -#
-  
-= form_for @tag, :url => create_tag_path do |f|
+
+-#= @tag.inspect
+
+= form_for @tag do |f|
   = f.label :name
   = f.text_field :name
+  %br
+
+  = f.label :name_seo
+  = f.text_field :name_seo
 
   %br
-  = f.label :is_public
+  = f.label "parent tag"
+  = f.select :parent_tag_id, options_for_select( @tags_list, :selected => ( params[:for_tag] || @tag.parent_tag_id ) )
+  
+  %br
   = f.check_box :is_public
+  = f.label :is_public
 
   %br
-  = f.label :is_trash
   = f.check_box :is_trash
+  = f.label :is_trash
 
   %br
   = f.submit

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

@@ -3,38 +3,16 @@
   - is_panel = true
 %li
   %div{ :class => is_panel ? 'panel' : '' }
-    = link_to tag.name, tag_path(tag.name_seo)
+    = link_to tag.name, tag_path(tag)
+    = link_to '[+]', new_tag_path( :for_tag => tag.id )
+    = link_to '[~]', edit_tag_path( tag )
+    .inline= button_to '[x]', tag_path( tag ), :method => :delete, :data => { :confirm => 'Are you sure?' }
     (#{tag.reports.length}) (#{tag.galleries.length}) (#{tag.videos.length})
       
     -# .descr= tag.descr
   
     - if tag.children_tags.length > 0
-      %ul
+      %ul.tags
         - tag.children_tags.map do |tt|
           = render 'ish_manager/tags/item', :tag => tt, :is_panel => false
 
-
-
-
-        
--# hidden       
-- proc do # nothing        
-  - if tag.reports.length > 0
-    .tag-reports
-      %h5 Reports
-      - tag.reports[0..Tag.n_reports-1].each do |report|
-        = render 'reports/item_mini', :report => report
-      .item-mini.hide
-        %h5= link_to '[More Reports]', tag_14path(tag.name_seo)
-      
-  - if tag.galleries.length > 0
-    %h5 Galleries
-    %ul.tag-galleries
-      - tag.galleries[0..Tag.n_galleries].each do |gallery|
-        %li= link_to gallery.name, gallery_path(gallery.galleryname, 0)
-      
-  - if tag.videos.length > 0
-    %h5 Videos
-    %ul.tag-videos
-      - tag.videos[0..Tag.n_videos].each do |video|
-        %li= link_to video.name, video_path(video.youtube_id)

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

@@ -0,0 +1,4 @@
+
+%h3
+  Edit Tag #{@tag.name}
+= render 'form', :tag => @tag

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

@@ -0,0 +1,2 @@
+
+= render :form, :tag => @tag

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

@@ -5,11 +5,13 @@
 .row
   .small-12.columns
     .center
-      %h1= t('tags.list')
+      %h1
+        Tags (#{Tag.count})
+        = link_to '[+]', new_tag_path
   
-    %ul.large-block-grid-2
+    %ul.tags
       - @tags.each do |tag|
-        = render 'tags/item', :tag => tag
+        = render 'item', :tag => tag
       - if @tags.blank?
         %li No Tags
 

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

@@ -5,20 +5,23 @@
   
 .row
   .large-12.columns
-    %h1.center On the topic of #{@tag.name}
-    = render 'ads/leaderboard'
+    %h5.center
+      = @tag.name
+      = link_to '[~]', edit_tag_path( @tag )
+      .inline= button_to 'X', tag_path( @tag ), :method => :delete, :data => { :confirm => 'Are you sure?' } 
+    -# = render 'ads/leaderboard'
     -# .descr= @tag.descr # I don't wanna show this every time to everyone, they know what they are here for.
-    = render 'features/list', :features => @tag.features[0, Tag.n_features]
+    = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features]
       
 .row
   .large-6.columns  
     %h4 Reports
-    = render 'reports/list', :reports => @reports, :n_ads => 0
+    = render 'ish_manager/reports/index', :reports => @tag.reports, :n_ads => 0
     %hr
     
   .large-6.columns
     %h4 Galleries
-    = render 'galleries/list', :galleries => @galleries, :n_thumbs => 4
+    = render 'ish_manager/galleries/index', :galleries => @tag.galleries, :n_thumbs => 4
     %hr
     
 .row
@@ -26,5 +29,5 @@
     %h4
       = t('videos.list')
       = link_to '[+]', new_video_path( :tag_id => @tag.id )
-    = render 'videos/list', :videos => @videos
+    = render 'ish_manager/videos/index', :videos => @tag.videos
     

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

@@ -1,9 +1,11 @@
 
+- videos ||= @videos
 - videos = videos.page params[:videos_page]
+
 .row
   .col-sm-12
     %h2
-      Videos (#{@videos.count})
+      Videos (#{videos.count})
       = link_to '[+]', new_video_path
 
     = paginate videos, :param_name => :videos_page

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.46
+  version: 0.1.8.47
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -259,6 +259,8 @@ 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/edit.haml
+- app/views/ish_manager/tags/edit.haml~
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml
 - app/views/ish_manager/tags/show.haml