ish_manager 0.1.8.251 → 0.1.8.255

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

@@ -1,6 +1,6 @@
 
 .row
-  .col-xs-12
+  .col.s12
     .center
       %h2
         = link_to gallery.name, gallery_path(gallery)
@@ -11,5 +11,5 @@
           %i.material-icons visibility
         - else
           %i.material-icons visibility_off
-      galleryname :: #{gallery.galleryname}
+      slug :: #{gallery.slug}
       = render 'meta', :item => gallery

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

@@ -18,7 +18,7 @@
 .row
   %ul
     - @photos.each do |photo|
-      %li.col-xs-1
+      %li.col.s1
         = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
 
 .spacer{ :style => 'height: 500px' }
@@ -26,7 +26,7 @@
 -# thumb
 .row.row-thumbs
   - @photos.each do |photo|
-    .col-xs-3
+    .col.s3
       .item
         = render 'ish_manager/photos/meta_manager', photo: photo
         = image_tag photo.photo.url( :thumb ), :alt => ''
@@ -38,4 +38,4 @@
     .item
       %a{id: "large_#{photo.id}" }
       = render 'ish_manager/photos/meta_manager', photo: photo
-      .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
+      .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }

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

@@ -8,7 +8,7 @@
   = link_to '[+]', new_invoice_path
 
 .row
-  .col-xs-12.col-md-6.col-md-offset-3
+  .col.s12.col.m6.col-md-offset-3
     = render 'form', :invoice => @new_invoice
 %hr
 

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

@@ -1,5 +1,5 @@
 
 .row
-  .col-xs-12.col-md-6.col-md-offset-3
+  .col.s12.col.m6.col-md-offset-3
     %h5 New Invoice
     = render 'form', :invoice => @new_invoice

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

@@ -1,5 +1,5 @@
 
 .row
-  .col-sm-6.col-sm-offset-3
+  .col.s6.col-sm-offset-3
     %h5 New Lead
     = render 'form', :lead => @new_lead

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

@@ -4,7 +4,7 @@
 
 - url = params[:action] == 'new' ? maps_path : map_path(@map.id)
 
-= form_for @map, :html => { :multipart => true }, url: url do |f|
+= form_for @map, :html => { :multipart => true, class: 'maps--form' }, url: url do |f|
   - if @map.errors.any?
     #error_explanation
       %h2= "#{pluralize(@map.errors.count, "error")} prohibited this map from being saved:"
@@ -13,25 +13,25 @@
           %li= message
 
   .row
-    .col-md-3
+    .col.s3
       .field
         = f.label :name
         = f.text_field :name
       .field
         = f.label :map_slug, "Map slug (if any)"
         = f.text_field :map_slug
-    .col-md-3
+    .col.s3
       .field
         = f.label :slug
         = f.text_field :slug
       .field
         = f.label :parent_slug
         = f.text_field :parent_slug
-    .col-md-2
+    .col.s2
       .field
         = f.label :ordering_type
         = f.select :ordering_type, options_for_select(::Gameui::Map::ORDERING_TYPES)
-    .col-md-4
+    .col.s4
 
       .field
         = f.label :image
@@ -42,5 +42,20 @@
     = f.label :description
     = f.text_area :description, class: 'tinymce'
 
+  .row
+    .col.s6
+      = f.label "Labels"
+      = f.text_area :labels, class: 'large'
+      %pre.small
+        description
+        map
+        markers
+        newsitems
+    .col.s6
+      = f.label "Config"
+      = f.text_area :config, class: 'large'
+      %pre.small
+        description.collapsible: bool
+        map_panel_type: "MapPanel" | "MapPanelNoZoom" | "ThreePanelV1"
   .actions
     = f.submit 'Save'

data/app/views/ish_manager/maps/_index_item.haml

@@ -0,0 +1,8 @@
+
+.item{ style: "display: flex; flex-direction: column;" }
+  = render 'map_meta_row', map: map
+  - if map.childs.length > 0
+    %ul{ style: "margin-left: 5em;" }
+      - map.childs.each do |m|
+        %li
+          = render 'index_item', map: m

data/app/views/ish_manager/maps/_map_meta_row.haml

@@ -1,10 +1,11 @@
 
-.flat-row
-  .a= link_to map.slug, map_path(map)
-  .a= button_to '~', edit_map_path(map), method: :get
-  .a= button_to 'map editor', location_map_editor_path(map.id), method: :get
-  .a <b>#{map.w}x#{map.h}_#{map.slug}</b>
-  .a= button_to '+marker', new_map_marker_path(map), method: :get
-  .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
-  .a= link_to '[api]', api_map_path(map)
-  .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
+.maps--map-meta-row
+  .flat-row
+    .a= link_to map.name, map_path(map)
+    .a= button_to '~', edit_map_path(map), method: :get
+    .a= button_to 'map editor', location_map_editor_path(map.id), method: :get
+    .a= button_to '+marker', new_map_marker_path(map), method: :get
+    .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
+    .a= link_to '[api]', api_map_path(map)
+    .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
+  .a= map.slug

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

@@ -1,3 +1,4 @@
-%h1 Editing map
 
+= render 'map_meta_row', map: @map
+%h1 Editing map
 = render 'form'

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

@@ -5,10 +5,12 @@
 .maps-index
   %h1 Maps (#{@maps.length}) #{link_to '[+]', new_map_path}
   - @maps.each do |map|
-    .item
-      = render 'map_meta_row', map: map
+    = render 'index_item', map: map
+
 
   %h1 All Maps (#{@all_maps.length})
   %ul
     - @all_maps.each do |m|
-      %li= link_to m.slug, edit_map_path(m.id)
+      %li
+        = link_to m.slug, map_path(m.id)
+        = link_to '[~]', edit_map_path(m.id)

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

@@ -32,10 +32,7 @@
           %li <b>item_type:</b> #{marker.item_type}
 
   %p.addToggle Newsitems (#{@map.newsitems.count}) [<>]
-  .newsitems-list
-    - @map.newsitems.each do |newsitem|
-      .item
-        = newsitem.inspect
+  = render 'ish_manager/newsitems/index', newsitems: @map.newsitems
 
   %p.addToggle Maps (#{@maps.count}) [<>]
   .maps-list

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

@@ -18,40 +18,40 @@
             %li= message
 
     .row
-      .col-md-1
+      .col.s1
         = f.label :map
         = f.text_field :map_id, value: @marker.map_id || params[:map_id]
-      .col-md-5
+      .col.s5
         .field
           = f.label :name
           = f.text_field :name
-      .col-md-6
+      .col.s6
         .field
           = f.label :slug
           = f.text_field :slug
     .row
-      .col-md-3
+      .col.s3
         .field
           = f.label :image
           = file_field_tag :image
           .image-thumb
             = image_tag(@marker.image.image.url(:thumb)) rescue nil
             = image_tag('icons/10x10_red-cross.png', class: 'red-cross', style: "top: #{@marker.centerOffsetY-10}px; left: #{@marker.centerOffsetX-10}px;" )
-      .col-md-3
+      .col.s3
         .field
           = f.label :centerOffsetX
           = f.text_field :centerOffsetX
         .field
           = f.label :centerOffsetY
           = f.text_field :centerOffsetY
-      .col-md-3
+      .col.s3
         .field
           = f.label :x
           = f.text_field :x
         .field
           = f.label :y
           = f.text_field :y
-      .col-md-3
+      .col.s3
         .field
           = f.label :title_image
           = file_field_tag :title_image
@@ -61,29 +61,29 @@
       = f.label :url, "URL (if any)"
       = f.text_field :url
     .row
-      .col-md-3  
-      .col-md-6
+      .col.s3  
+      .col.s6
         .field
           = f.label :description
           = f.text_area :description
     .row
-      .col-md-4
+      .col.s4
         .field
           = f.label :item_type
           = f.select :item_type, options_for_select( ::Gameui::Marker::ITEM_TYPES, selected: @marker.item_type )
-      .col-md-4
+      .col.s4
         .field
           = f.label :ordering
           = f.text_field :ordering
-      .col-md-4
+      .col.s4
     .row
-      .col-md-3  
-      .col-md-6
+      .col.s3  
+      .col.s6
         .row
-          .col-md-6
+          .col.s6
             .field
               = f.check_box :is_active
               = f.label :is_active
-          .col-md-6
+          .col.s6
             .actions
               = f.submit 'Save'

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

@@ -1,43 +1,53 @@
+-#
+-# ish_manager / newsitems / _form
+-#
 
 = form_for newsitem, :html => { :multipart => true } do |f|
   .row
-    .col-sm-6{ style: 'border-right: 1px solid red;' }
-      %br
-      = f.label :map
-      = f.select :map_id, options_for_select( @maps_list, selected:( @map ? @map.id : params[:map_id] || nil ) )
-      %br
-      = f.label :site
-      = f.select :site_id, options_for_select( @sites_list, :selected => ( @site ? @site.id : params[:site_id] || nil ) )
-      %br
-      = f.label :city
-      = f.select :city_id, options_for_select( @cities_list, :selected => ( @city ? @city.id : params[:city_id] || nil ) )
-      %br
-      = f.label :tag
-      = f.select :tag_id, options_for_select( @tags_list, selected:( @tag ? @tag.id : params[:tag_id] || nil ) )
-      %br
-      = f.label :user_profile
-      = f.select :user_profile_id, options_for_select( @user_profiles_list, selected: ( @user_profile ? @user_profile.id : params[:user_profile_id] || nil ) )
 
-    .col-sm-6
-      = f.label :name
-      = f.text_field :name
-      = f.label :descr
-      = f.text_area :descr, :class => :tinymce
-      = label_tag :photo
-      = file_field_tag :photo
+    .col.s6
+      .field
+        = f.label :name
+        = f.text_field :name
+      .field
+        = f.label :created_at
+        = f.text_field :created_at
+      .field
+        = f.label :descr
+        = f.text_area :descr, :class => :tinymce
+      .field
+        = label_tag :photo
+        = file_field_tag :photo
+
+    .col.s6
+      .field
+        = f.label :map
+        = f.select :map_id, options_for_select( @maps_list, selected:( newsitem[:map_id] || params[:map_id] ) )
+      .field
+        = f.label :site
+        = f.select :site_id, options_for_select( @sites_list, :selected => ( newsitem[:site_id] || params[:site_id] ) )
+      .field
+        = f.label :city
+        = f.select :city_id, options_for_select( @cities_list, :selected => ( newsitem[:city_id] || params[:city_id] ) )
+      -# @TODO: tags must be multi-select, not 1x1
+      .field
+        = f.label :user_profile
+        = f.select :user_profile_id, options_for_select( @user_profiles_list, selected: ( newsitem[:user_profile_id] || params[:user_profile_id] ) )
+
+
   %hr
   .row
-    .col-sm-6
-      = f.label :video
-      = f.select :video_id, options_for_select( @videos_list, :selected => @newsitem.video_id )
-      .a
-      = f.label :gallery
-      = f.select :gallery_id, options_for_select( @galleries_list, :selected => @newsitem.gallery_id )
-      .a
-      = f.label :report
-      = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id )
-  .a
+    .col.s6
+      .field
+        = f.label :video
+        = f.select :video_id, options_for_select( @videos_list, :selected => @newsitem.video_id )
+      .field
+        = f.label :gallery
+        = f.select :gallery_id, options_for_select( @galleries_list, :selected => @newsitem.gallery_id )
+      .field
+        = f.label :report
+        = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id )
 
-  .a
-    = f.submit :submit
+    .col.s6
+      = f.submit :submit
 

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

@@ -1,38 +1,27 @@
-
-- if defined? site
-  - edit_url     = ->(n) { edit_site_newsitem_path( site, n ) }
-  - delete_url   = ->(n) { site_newsitem_path( site, n ) }
-  - new_newsitem = new_site_newsitem_path( site.id )
-- if defined? city
-  - edit_url     = ->(n) { edit_city_newsitem_path( city, n ) }
-  - delete_url   = ->(n) { city_newsitem_path( city, n ) }
-  - new_newsitem = new_city_newsitem_path( city.id )
-- if defined?( tag ) && tag.class.name == 'Tag'
-  - edit_url     = ->(n) { edit_tag_newsitem_path( tag, n ) }
-  - delete_url   = ->(n) { tag_newsitem_path( tag, n ) }
-  - new_newsitem = new_tag_newsitem_path( tag.id )
+-#
+-# ish_manager / newsitems / _index
+-#
 
 - newsitems = newsitems.page( params[:newsitems_page] ).per( 10 )
 
 .manager-newsitems--index
-  .row
-    .col-sm-12
-      %h5 Newsitems (#{newsitems.count}) #{link_to image_new, new_newsitem }
-      = paginate newsitems, :param_name => :newsitems_page, :views_prefix => 'ish_manager'
-      - newsitems.each do |n|
-        .panel
-          .panel-body
-            %ul
-              %li
-                .float-left= link_to '[~]', edit_url.call( n )
-                .float-left= button_to '[x]', delete_url.call( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-                Name: #{n.name}
-              %li Desc: #{n.descr}
-              %li Report id: #{n.report_id}
-              %li Gallery id: #{n.gallery_id}
-              %li username: #{n.username}
-              - if n.photo
-                %li Photo id: #{n.photo.id}
-            = render 'ish_manager/newsitems/item', :newsitem => n
-      = paginate newsitems, :param_name => :newsitems_page, :views_prefix => 'ish_manager'
-  %hr
+  %h5 Newsitems (#{newsitems.count}) #{link_to image_new, new_newsitem_path }
+  = paginate newsitems, :param_name => :newsitems_page, :views_prefix => 'ish_manager'
+  - newsitems.each do |n|
+    .card
+      .card-content
+        %ul
+          %li
+            .float-left= link_to '[~]', edit_newsitem_path(n)
+            .float-left= button_to '[x]', newsitem_path( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+            Name: #{n.name}
+          %li Desc: #{n.descr}
+          %li Created at: #{n.created_at}
+          %li Report id: #{n.report_id}
+          %li Gallery id: #{n.gallery_id}
+          %li username: #{n.username}
+          - if n.photo
+            %li Photo id: #{n.photo.id}
+        = render 'ish_manager/newsitems/item', :newsitem => n
+  = paginate newsitems, :param_name => :newsitems_page, :views_prefix => 'ish_manager'
+

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

@@ -8,7 +8,7 @@
         - if n.photo.gallery.blank?
           = link_to image_tag( n.photo.photo.url(:small) ), n.photo.photo.url(:large), :rel => 'lightbox[newsitem]'
         - else
-          = link_to image_tag( n.photo.photo.url(:small) ), gallery_path( n.photo.gallery.galleryname, n.photo.gallery.photos.index(n.photo) )
+          = link_to image_tag( n.photo.photo.url(:small) ), gallery_path( n.photo.gallery.slug, n.photo.gallery.photos.index(n.photo) )
       .meta= render 'ish_manager/photos/meta', :photo => n.photo
 
   - if n.report
@@ -17,19 +17,19 @@
         %li <b>Report</b> #{n.report.id}
         %li Premium Tier #{n.report.premium_tier}
       %h5
-        = link_to n.report.name, report_path(n.report.name_seo)
+        = link_to n.report.name, report_path(n.report.slug)
         = link_to "[~]", edit_report_path(n.report)
       .meta
         on #{pretty_date n.report.created_at} by #{n.report.username}
       - unless n.report.photo.blank?
-        .thumb= link_to image_tag(n.report.photo.photo.url(:thumb), :alt => ''), report_path( n.report.name_seo )
+        .thumb= link_to image_tag(n.report.photo.photo.url(:thumb), :alt => ''), report_path( n.report.slug )
       .subhead= n.report.subhead
       .c
 
   - if !n.gallery.blank?
     .Ngallery
 
-      %h3= link_to n.gallery.name, gallery_path(n.gallery.galleryname, 0)
+      %h3= link_to n.gallery.name, gallery_path(n.gallery.slug, 0)
       .meta
         #{t('newsitems.gallery', :username => n.gallery.username, :date => pretty_date(n.gallery.created_at))}
         - unless n.gallery.city.blank?
@@ -38,11 +38,11 @@
         - unless n.gallery.tags.blank?
           = t('tags.in')
           - n.gallery.tags do |tag|
-            = link_to tag, tag_path(tag.name_seo)
+            = link_to tag, tag_path(tag.slug)
       - unless 0 == n.gallery.photos.length
-        - n.gallery.photos.where( :is_trash => false )[0...8].each do |photo|
-          = link_to image_tag( photo.photo.url(:thumb), :alt => photo.name ), photo.photo.url(:small), :rel => "lightbox[#{n.gallery.galleryname}]"
-      -# .subhead= n.descr
+        .thumbnails
+          - n.gallery.photos.where( :is_trash => false )[0...8].each do |photo|
+            = link_to image_tag( photo.photo.url(:thumb), :alt => photo.name ), photo.photo.url(:small), :rel => "lightbox[#{n.gallery.slug}]"
       .c
 
   - if n.video_id

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

@@ -4,13 +4,14 @@
 - if defined? @site
   - url = site_newsitem_path( @site, @newsitem ) if @site
 
-.row
-  .small-12.columns
-    %h1 Edit this newsitem
-    - if @site
-      For site: #{@site.domain} #{@site.lang} <br />
-    - if @city
-      For city: #{@city.name} <br />
-    id: #{@newsitem.id}
-    
-    = render 'form', :newsitem => @newsitem, :url => url
+.newsitems-edit
+  %h1 Edit Newsitem
+  - if @site
+    For site: #{@site.domain} #{@site.lang} <br />
+  - if @city
+    For city: #{@city.name} <br />
+
+  = render 'form', :newsitem => @newsitem, :url => url
+
+.debug
+  = @newsitem.inspect

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

@@ -5,5 +5,5 @@
     - unless photo.user.blank?
       By #{ link_to photo.user.username, user_path(photo.user.username) }
     - unless photo.gallery.blank?
-      In #{ link_to photo.gallery.name, gallery_path(photo.gallery.galleryname, 0) }
+      In #{ link_to photo.gallery.name, gallery_path(photo.gallery.slug, 0) }
   = photo.name unless photo.name.blank?

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

@@ -1,25 +1,35 @@
+-#
+-# ish_manager / reports / _form
+-#
 
 - url ||= reports_path
 = form_for report, :url => url, :html => { :multipart => true } do |f|
-
   - if report.errors.any?
     #error_explanation
       %h3= t('e.there_are_errors')
-
       %ul
         - report.errors.full_messages.each do |msg|
           %li= msg
+
   .row
-    .col-md-6
+    .col.s4
       .field
-        = f.label :"Name & Name SEO"
+        = f.label :"Name"
         = f.text_field :name, :class=> 'form-control', :placeholder => "name of report", :type => "text"
-        = f.text_field :name_seo, :class=> 'form-control', :placeholder => "name seo", :type => "text"
+        -# = f.text_field :slug, :class=> 'form-control', :placeholder => "name seo", :type => "text"
 
-    .col-md-6
+    .col.s4
       .field
         = f.label :subhead
         = f.text_area :subhead, :class => 'form-control', :rows => "5", :style=> "resize: vertical;"
+      .field
+        = f.label "Item Type: default, longscroll"
+        = f.text_field :item_type
+
+    .col.s4
+      .field
+        = f.label :created_at
+        = f.text_field :created_at
 
   .field
     = f.label :Description
@@ -28,7 +38,7 @@
   %br
 
   .row
-    .col-md-4
+    .col.s4
       .field
         %label City
         = select :report, :city_id, @cities_list, :class=>"btn"
@@ -36,30 +46,30 @@
         = f.label :Coordinates
         .panel.panel-default
           .panel-body
-            .col-md-6
+            .col.s6
               .form-group
                 %label{} X-coordinate
                 = f.text_field :x, :placeholder => "x", :type => "text", :class=>"form-control"
 
-            .col-md-6
+            .col.s6
               .form-group
                 %label{} Y-coordinate
                 = f.text_field :y, :placeholder => "y", :type => "text", :class=>"form-control"
-    .col-sm-4
+    .col.s4
       .field
         = f.label :premium_tier
         = f.number_field :premium_tier
       .field
         = f.label :user_profile
         = select :report, :user_profile_id, @user_profiles_list
-    .col-md-4
+    .col.s4
       unused
 
   .row
-    .col-md-6
+    .col.s6
       = f.label :site
       = f.select :site_id, options_for_select(@sites_list, :selected => report.site_id || params[:site_id] )
-    .col-md-6
+    .col.s6
       = f.label :tags
       = f.select :tag_ids, @tags_list, {}, { multiple: true }
 
@@ -68,7 +78,7 @@
       %h3.panel-title Upload File
     .panel-body
       .row
-        .col-md-6.col-md-offset-3
+        .col.s6.col.soffset-3
           %button.btn.btn-primary.btn-lg.btn-block{:type => "button", :onClick => "upload()"} Upload File
       = file_field_tag :photo, :style => "display:none", :id=>"photo"
       .div.center

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

@@ -8,7 +8,7 @@
   
 .manager-reports--index
   .row
-    .col-sm-12
+    .col.s12
       %h5
         Reports (#{reports.length})
         = link_to image_new, new_path

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

@@ -1,6 +1,6 @@
 
 .row
-  .col-sm-12
+  .col.s12
     %h1
       %strong New Report
     = render 'ish_manager/reports/form', :report => @report

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

@@ -9,7 +9,8 @@
       .meta
         -# By #{link_to @report.user_profile.username, user_path( @report.user )}
         On #{@report.created_at.to_s.slice(0, 10)}
-        In #{link_to "http://#{@report.site.domain}/#{@report.site.lang}", site_path( @report.site )}
+        - if @report.site
+          In #{link_to "http://#{@report.site.domain}/#{@report.site.lang}", site_path( @report.site )}
         -# - if @report.tag
         -#   Tagged #{link_to @report.tag.name, manager_tag_path( @report.tag )}
         - if @report.city