ish_manager 0.1.8.21 → 0.1.8.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6397016c614d5c21d05d363637e82acedf46be31
-  data.tar.gz: db623739218c25f138e002a4d6b89dfed8f12fd2
+  metadata.gz: dab98bdd473dd73c5e605837baef4929d2c3a2e5
+  data.tar.gz: c5b9dbf5af313ee127c5514b8f8de24cfe3c2826
 SHA512:
-  metadata.gz: d938bd5884995b632c6df2398f91831125bd1a715e37828eabc2e86b09327f854e639408cdb613758482f8721669f0778accb4f22841e5863dd538aa4bdecb5f
-  data.tar.gz: 6b69929120f6a47eb3c34505c355d162bd0bec381dc4657bb2f25777f2a2daa8459233274fec370854b5bf320c8038c1a81a63c217cfa3f211c8d7d0ff30585b
+  metadata.gz: 055cb68777f29f675ed4329af211d15b81508f1cd87e28c54e2d8a609ff3c38e83f72b4becc4ce70be8dee8b53dc79b71cdccea8e9c27eda5884539ffb4d4feb
+  data.tar.gz: cb1caf9d2acf949542fa9d77c52d58d008ca90f42f7bb677f765e40e5f747334354fb2c453ec273f477aaff970c0eaf28e0b3818adddb89ad3ce647df3f43225

data/app/assets/javascripts/ish_manager/application.js

@@ -31,7 +31,16 @@ $(function () {
 });
 
 $(document).ready(function () {
-  $('*[data-confirm]').click(function(){
-    return confirm($(this).attr('data-confirm'));
-  });
+    $('*[data-confirm]').click(function(){
+        return confirm($(this).attr('data-confirm'));
+    });
+
+    if ($(".tinymce").length > 0) {
+        tinymce.init({
+            mode: "specific_textareas",
+            editor_selector: 'tinymce',
+            plugins: 'link'
+        });
+    }
 });
+ 

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -25,7 +25,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @city.newsitems << n
       flag = @city.save
       if flag
-        url = edit_manager_city_path( @city.id )
+        url = edit_city_path( @city.id )
       else
         error = 'No Luck. ' + @city.errors.inspect
       end
@@ -36,7 +36,7 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @site.newsitems << n
       flag = @site.save
       if flag
-        url = edit_manager_site_path( @site.id )
+        url = edit_site_path( @site.id )
       else
         error = 'No Luck. ' + @site.errors.inspect
       end
@@ -58,14 +58,15 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
   end
 
   def destroy
+    authorize! :destroy, Newsitem
     if params[:city_id]
       flag = City.find( params[:city_id] ).newsitems.find( params[:id] ).destroy
-      url = edit_manager_city_path( params[:city_id] )
+      url = edit_city_path( params[:city_id] )
     end
     if params[:site_id]
       site = Site.find( params[:site_id] )
       flag = site.newsitems.find( params[:id] ).destroy
-      url = edit_manager_site_path( params[:site_id] )
+      url = edit_site_path( params[:site_id] )
     end
 
     flash[:notice] = "Success? #{flag}"
@@ -77,12 +78,12 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @site = Site.find params[:site_id]
       @site.touch
       @newsitem = @site.newsitems.find params[:id]
-      url = edit_manager_site_path( @site )
+      url = edit_site_path( @site )
     end
     if params[:city_id]
       @city = City.find params[:city_id]
       @newsitem = @city.newsitems.find params[:id]
-      url = edit_manager_city_path( @city )
+      url = edit_city_path( @city )
     end
     flag = @newsitem.update_attributes params[:newsitem].permit!
     

data/app/helpers/ish_manager/application_helper.rb

@@ -1,4 +1,9 @@
 module IshManager
   module ApplicationHelper
+
+    def pretty_date input
+      return input.strftime("%Y-%m-%d")
+    end
+
   end
 end

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

@@ -1,12 +1,12 @@
 
-- title "City #{@city.name}"
+-# - title "City #{@city.name}"
 
 .row
   .large-12.columns
 
     %h2
       = @city.name
-      = link_to '[~]', edit_manager_city_path(@city)
+      = link_to '[~]', edit_city_path(@city)
 
     - unless @city.profile_photo.blank?
       = image_tag @city.profile_photo.photo.url(:thumb)
@@ -14,10 +14,10 @@
     %hr
     %ul.menu-secondary
       %li
-        = link_to '[+]', new_manager_city_feature_path( @city )
+        = link_to '[+]', new_city_feature_path( @city )
         Features (#{@city.features.length})
       %li
-        = link_to '[+]', new_manager_city_newsitem_path( @city )
+        = link_to '[+]', new_city_newsitem_path( @city )
         Newsitems (#{@city.newsitems.length})
       %li New Report
       %li New Gallery
@@ -27,8 +27,8 @@
       %li New Community
     %hr
 
-    = render 'manager/features/index', :features => @city.features, :city => @city
-    = render 'manager/newsitems/index', :newsitems => @city.newsitems, :city => @city
+    = render 'ish_manager/features/index', :features => @city.features, :city => @city
+    = render 'ish_manager/newsitems/index', :newsitems => @city.newsitems, :city => @city
     
     %h3
       = t('reports.list')
@@ -36,14 +36,14 @@
     %ul
       - @city.reports.each do |report|
         %li
-          = link_to '[~]', edit_manager_report_path(report)
+          = link_to '[~]', edit_report_path(report)
           = report.name
 
     .galleries-list
       %h3
         = t('galleries.list')
         (#{@city.galleries.length})
-      = render '/manager/galleries/list_short', :galleries => @city.galleries
+      = render 'ish_manager/galleries/list_short', :galleries => @city.galleries
 
     %h3
       = t('users.list')

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

@@ -4,9 +4,9 @@
   - delete_url = -> (feature ) { city_feature_path(      city.id, feature.id ) }
   - new_path   = new_city_feature_path( city.id )
 - if defined? site
-  - edit_url   = -> (feature) { edit_manager_site_feature_path( site.id, feature.id ) }
-  - delete_url = -> (feature) { manager_site_feature_path(      site.id, feature.id ) }
-  - new_path   = new_manager_site_feature_path( site.id )
+  - edit_url   = -> (feature) { edit_site_feature_path( site.id, feature.id ) }
+  - delete_url = -> (feature) { site_feature_path(      site.id, feature.id ) }
+  - new_path   = new_site_feature_path( site.id )
   
 .manager-features--index
   %h2
@@ -19,5 +19,5 @@
       %li
         = link_to '[~]', edit_url.call( feature )
         = link_to '[x]', delete_url.call( feature ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-        .item= render 'manager/features/item', :feature => feature
+        .item= render 'ish_manager/features/item', :feature => feature
          

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

@@ -10,5 +10,5 @@
           %li
             - gallery.photos.unscoped.where({ :is_trash => false })[0..4].each do |photo|
               .mini= image_tag photo.photo.url( :mini ), :alt => ''
-            #{link_to gallery.name, manager_gallery_path( gallery )} (#{gallery.photos.unscoped.where({ :is_trash => false }).length})
+            #{link_to gallery.name, gallery_path( gallery )} (#{gallery.photos.unscoped.where({ :is_trash => false }).length})
       = paginate galleries, :param_name => :galleries_page

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

@@ -1,17 +1,22 @@
 
 - if defined? site
-  - edit_url   = ->(n) { edit_manager_site_newsitem_path( site, n ) }
-  - delete_url = ->(n) { manager_site_newsitem_path( site, n ) }
+  - edit_url   = ->(n) { edit_site_newsitem_path( site, n ) }
+  - delete_url = ->(n) { site_newsitem_path( site, n ) }
 - if defined? city
-  - edit_url   = ->(n) { edit_manager_city_newsitem_path( city, n ) }
-  - delete_url = ->(n) { manager_city_newsitem_path( city, n ) }
+  - edit_url   = ->(n) { edit_city_newsitem_path( city, n ) }
+  - delete_url = ->(n) { city_newsitem_path( city, n ) }
   
 .row
   .small-12.columns
     %h2 Newsitems (#{newsitems.count})
-    %ul
+    %ol
       - newsitems.each do |n|
         %li
-          = link_to '[~]', edit_url.call( n )
-          = link_to '[x]', delete_url.call( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-          = n.name
+          %ul
+            %li
+              = link_to '[~]', edit_url.call( n )
+              = link_to '[x]', delete_url.call( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+              Name: #{n.name}
+              Desc: #{n.descr}
+            %li Report id: #{n.report_id}
+            %li Gallery id: #{n.gallery_id}

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

@@ -8,9 +8,9 @@
       %ol
         - reports.each do |report|
           %li
-            = link_to '[~]', edit_manager_report_path( report )
-            = link_to '[x]', manager_report_path( report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-            = link_to report.name, manager_report_path( report )
+            = link_to '[~]', edit_report_path( report )
+            = link_to '[x]', report_path( report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+            = link_to report.name, report_path( report )
             - if report.subhead && report.subhead.length > 3
               .subhead= report.subhead
       = paginate reports, :param_name => :reports_page

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

@@ -4,34 +4,34 @@
     .large-12.columns
       %h1
         Site http://#{@site.domain}/#{@site.lang}
-        = link_to '[~]', edit_manager_site_path( @site.id )
+        = link_to '[~]', edit_site_path( @site.id )
       
   .row
     .large-6.columns
-      = render 'manager/galleries/index', :galleries => @galleries
+      = render 'ish_manager/galleries/index', :galleries => @galleries
     .large-6.columns
-      = render 'manager/reports/index', :reports => @reports
+      = render 'ish_manager/reports/index', :reports => @reports
 
   .row
     .large-6.columns
-      = render 'manager/videos/index', :videos => @videos
+      = render 'ish_manager/videos/index', :videos => @videos
     .large-6.columns
-      = render 'manager/tags/index', :tags => @tags
+      = render 'ish_manager/tags/index', :tags => @tags
             
   .row
     .large-12.columns
-      = render 'manager/features/index', :features => @features, :site => @site
+      = render 'ish_manager/features/index', :features => @features, :site => @site
 
   .row
     .large-12.columns
       %h4
         Newsitems (#{@newsitems.length})
-        = link_to "[+]", new_manager_site_newsitem_path( @site )
+        = link_to "[+]", new_site_newsitem_path( @site )
       
       %ol
         - @newsitems.each do |newsitem|
           %li
             %ul
-              %li= link_to '[Delete]', manager_sites_newsitem_path(@site.id, newsitem.id), :method => :delete, :data => { :confirm => 'Are you sure?' }
-            = render 'manager/newsitems/item', :newsitem => newsitem
+              %li= button_to '[x]', site_newsitem_path(@site.id, newsitem.id), :method => :delete, :data => { :confirm => 'Are you sure?' }
+            = render 'ish_manager/newsitems/item', :newsitem => newsitem
       = paginate @newsitems, :param_name => 'newsitems_page'

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

@@ -0,0 +1,12 @@
+
+.tags-features
+  .title
+    %h1
+      = link_to t('tags.list'), tags_path
+
+  .items
+    - feature_tags.each do |tag|
+      .item
+        %h3= link_to tag['name_'+@locale.to_s], tag_path(tag.name_seo)
+
+  .c

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

@@ -0,0 +1,19 @@
+
+-#
+-# tags / _form
+-#
+  
+= form_for @tag, :url => create_tag_path do |f|
+  = f.label :name
+  = f.text_field :name
+
+  %br
+  = f.label :is_public
+  = f.check_box :is_public
+
+  %br
+  = f.label :is_trash
+  = f.check_box :is_trash
+
+  %br
+  = f.submit

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

@@ -0,0 +1,17 @@
+
+- content_for :title do
+  = t('tags.list')
+
+.row
+  .small-12.columns
+    .center
+      %h1= t('tags.list')
+  
+    %ul.large-block-grid-2
+      - @tags.each do |tag|
+        = render 'ish_manager/tags/item', :tag => tag
+      - if @tags.blank?
+        %li No Tags
+
+
+

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

@@ -0,0 +1,40 @@
+
+- if !defined? is_panel
+  - is_panel = true
+%li
+  %div{ :class => is_panel ? 'panel' : '' }
+    = link_to tag.name, tag_path(tag.name_seo)
+    (#{tag.reports.length}) (#{tag.galleries.length}) (#{tag.videos.length})
+      
+    -# .descr= tag.descr
+  
+    - if tag.children_tags.length > 0
+      %ul
+        - tag.children_tags.map do |tt|
+          = render '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_path(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/_list.haml

@@ -0,0 +1,8 @@
+
+- if tags.length > 0
+  .tags--list
+    .inner
+      .title
+        %h3= t('tags.list')
+      - tags.each do |tag|
+        .item= link_to tag['name_'+@locale.to_s], tag_path(tag.name_seo)

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

@@ -0,0 +1,5 @@
+
+.list--simple
+  %ul.block
+    - tags.each do |tag|
+      %li= link_to tag.name, tag_path(tag.name_seo)

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

@@ -0,0 +1,17 @@
+
+- content_for :title do
+  = t('tags.list')
+
+.row
+  .small-12.columns
+    .center
+      %h1= t('tags.list')
+  
+    %ul.large-block-grid-2
+      - @tags.each do |tag|
+        = render 'tags/item', :tag => tag
+      - if @tags.blank?
+        %li No Tags
+
+
+

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

@@ -0,0 +1,3 @@
+
+%h1 New Tag
+= render 'form', :tag => @tag

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

@@ -0,0 +1,30 @@
+-## tags/show
+
+- content_for :title do
+  Topic #{@tag.name}
+  
+.row
+  .large-12.columns
+    %h1.center On the topic of #{@tag.name}
+    = 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]
+      
+.row
+  .large-6.columns  
+    %h4 Reports
+    = render 'reports/list', :reports => @reports, :n_ads => 0
+    %hr
+    
+  .large-6.columns
+    %h4 Galleries
+    = render 'galleries/list', :galleries => @galleries, :n_thumbs => 4
+    %hr
+    
+.row
+  .large-12.columns
+    %h4
+      = t('videos.list')
+      = link_to '[+]', new_video_path( :tag_id => @tag.id )
+    = render 'videos/list', :videos => @videos
+    

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

@@ -6,6 +6,8 @@
     %meta{ :charset => 'UTF-8' }
     %meta{ :description => 'some description' }
     %script{ :src => "https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js" }
+    %script{ :src => "https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
+    %script{ :src => "https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
     = stylesheet_link_tag    "ish_manager/application", media: "all"
     = javascript_include_tag "ish_manager/application"
     = csrf_meta_tags

data/config/routes.rb

@@ -3,18 +3,22 @@ IshManager::Engine.routes.draw do
 
   resources :cities do
     resources :features
+    resources :newsitems
   end
   resources :events
   resources :galleries do
     post 'multiadd', :to => 'photos#j_create', :as => :multiadd
   end
   resources :newsitems
-  resources :reports
   resources :photos
+  resources :reports
   resources :sites do
+    resources :features
     resources :galleries
+    resources :newsitems
     resources :reports
   end
+  resources :tags
   resources :user_profiles
   resources :venues
   resources :videos

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.21
+  version: 0.1.8.22
 platform: ruby
 authors:
 - piousbox
@@ -219,6 +219,15 @@ files:
 - app/views/ish_manager/sites/index.haml
 - app/views/ish_manager/sites/new.haml
 - app/views/ish_manager/sites/show.haml
+- app/views/ish_manager/tags/_features.haml
+- app/views/ish_manager/tags/_form.haml
+- app/views/ish_manager/tags/_index.haml
+- 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/index.haml
+- app/views/ish_manager/tags/new.haml
+- app/views/ish_manager/tags/show.haml
 - app/views/ish_manager/videos/_index.haml
 - app/views/layouts/ish_manager/application.haml
 - app/views/layouts/ish_manager/application.haml~