ish_manager 0.1.8.121 → 0.1.8.122

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22a0ee908b1256f58c1acd9d32fd4ae7aae400e3
-  data.tar.gz: e1000487f081267dc261930269a2d61e8eac8e87
+  metadata.gz: 4e6f9c39cc27d8b44e998be4fbb42f037beb20d4
+  data.tar.gz: 500aa4bfda9c3f8e135c9b8739112d232bd64b8f
 SHA512:
-  metadata.gz: cdb18476ab3e77ac283ecf6ba72b7981a6fdac7fd2bab1252a5c649a53e0164fa70c4c191059d94eb3640f4d70fd6e32429ddeee21d8286a45c1eb723b2c57b5
-  data.tar.gz: 4c0e3f8a65b5cf8ddba541302fffa32e23be10389a855bd97966e8130d81870fa61315748ee548742abecdb2f58c0a2ec79e3c2254c276633070675adbf8cb82
+  metadata.gz: 1874aa9677fd40fd60efae23fc3d2feb4dfc8e4e21818eae989a41f501dfd1938b758f3b56551a3ae4abf1522413426f46a6991cc56b0f9432bf17d05d9862d2
+  data.tar.gz: 67bf5e18d6f8b9a5c2f8f6f211785b13b6b73f80a0dcc573220d69b28be31037fdda080b123bdd96967b11cd60b00930e7a24dba295b1cf4c5f7e0b51ca31d05

data/app/controllers/ish_manager/sites_controller.rb

@@ -29,7 +29,7 @@ class IshManager::SitesController < IshManager::ApplicationController
     @galleries = @site.galleries.unscoped.where({ :is_trash => false }).page( params[:galleries_page] ).per( 10 )
     @reports = @site.reports.unscoped.where({ :is_trash => false }).page( params[:reports_page] ).per( 10 )
     @videos = @site.videos.page( params[:videos_page] ).per( 5 )
-    @tags = Tag.where( :site_id => @site.id ).page( params[:tags_page] ).per( 100 )
+    @tags = Tag.where( :site_id => @site.id, :parent_tag_id => nil ).page( params[:tags_page] ).per( 100 )
     @features = @site.features.page( params[:features_page] ).per( 9 )
     @newsitems = @site.newsitems.page( params[:newsitems_page] ).per( @site.newsitems_per_page )
   end

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

@@ -19,8 +19,8 @@
         = f.select :parent_tag_id, options_for_select( @tags_list, :selected => ( params[:for_tag] || @tag.parent_tag_id ) )
     .col-xs-12.col-md-6
       .input-field 
-        = f.select :site, options_for_select( @sites_list, :selected => @tag.site_id )
         = f.label "site"
+        = f.select :site, options_for_select( @sites_list, :selected => @tag.site_id )
     .col-xs-12.col-md-12
       .input-field
         = f.check_box :is_public

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

@@ -3,14 +3,17 @@
   Tags
 
 .manager-tags--index
-  .center
-    %h1 Tags (#{tags.count})
+  .panel
+    .panel-body
+      .center
+        %h1 Tags (#{tags.count})
 
-  %ul.large-block-grid-2
-    - @tags.each do |tag|
-      = render 'ish_manager/tags/item', :tag => tag
-    - if @tags.blank?
-      %li No Tags
-  %hr
+
+      %ul.tags
+        - @tags.each do |tag|
+          = render 'ish_manager/tags/item', :tag => tag
+        - if @tags.blank?
+          %li No Tags
+      %hr
 
 

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

@@ -1,15 +1,11 @@
 
-- if !defined? is_panel
-  - is_panel = true
 %li
-  %div{ :class => is_panel ? 'panel' : '' }
+  %div
     = 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?' }
     (R #{tag.reports.length}) (G #{tag.galleries.length}) (V #{tag.videos.length})
-      
-    -# .descr= tag.descr
   
     - if tag.children_tags.length > 0
       %ul.tags

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.121
+  version: 0.1.8.122
 platform: ruby
 authors:
 - piousbox