c80_news_tz 0.1.1.18 → 0.1.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c1b9b1d8a903b6fb209179f36690f5645404cc
-  data.tar.gz: 58ab6e3a21b235b9258aaf85e6350109ec0d92ed
+  metadata.gz: 8a0f668c3dc59e8d30d94346ccf26593481b0849
+  data.tar.gz: 795d636d35a71bcc89bd7c8acdd8883288d68eac
 SHA512:
-  metadata.gz: 201fc0c685907eb8142c075cefcccd10312e1ccac354dd14a4801d692c305eabd246853e7a3721002a3a1daa5a7e171a0b8c4f6f9db363279b74603124a434bb
-  data.tar.gz: 72cc3f9218de587aeb78bf7ea450b9c884e8b9db3b3b37be3ed203f53d634c9caf0367b04c868456c5182f40f48c8b4c7935ddd964028f0b0a466f1bc54c2140
+  metadata.gz: bf27bbad97a44b79f4fff931f2afa6f2a6712716ec3e8d8b1586d54dade8f99897e13f6a0dfda93808d97a839c0991849e5e398cfbea43c95914e61c59ec4845
+  data.tar.gz: 5c9b791dd6374432cfd3eb4ac6fadc86ff96cea5b8eff92df1b8db079dca371f46a293c7d2d2f128e9fb892dc85f8cb0b9c30f51b595ab628600b9292c589778

data/app/admin/c80_news_tz/locations.rb

@@ -1,6 +1,6 @@
 ActiveAdmin.register C80NewsTz::Location, :as => 'Location' do
 
-  menu :label => "Места на главной", :parent => 'Содержимое сайта'
+  menu :label => "Публикации на главной", :parent => 'Содержимое сайта'
 
   before_filter :skip_sidebar!, :only => :index
 

data/app/admin/c80_news_tz/r_advertisers.rb

@@ -0,0 +1,60 @@
+ActiveAdmin.register C80NewsTz::RAdvertiser, :as => 'RAdvertiser' do
+
+  menu :label => "Рекламодатели", :parent => 'Содержимое сайта'
+
+  # before_filter :skip_sidebar!, :only => :index
+
+  permit_params :title,
+                :logo,
+                :r_blurb_ids => []
+
+  config.sort_order = 'title_asc'
+
+  filter :title
+
+  # controller do
+  #   cache_sweeper :suit_sweeper, :only => [:update,:create,:destroy]
+  # end
+
+  index do
+    selectable_column
+    id_column
+    column :title
+    column :logo do |a|
+      if a.logo.present?
+        "#{image_tag("#{a.logo.thumb_preview_big.url}")}".html_safe
+      end
+    end
+
+    column :r_blurbs do |issue|
+      # нарисуем список
+      list_items = ((issue.r_blurbs.map { |p|
+        "<li>• #{ p.title } <a href='/news/#{p.slug}' target='_blank'>[view]</a> <a href='/admin/r_blurbs/#{p.slug}/edit'>[edit]</a> </li>"
+      }).join("")).html_safe
+
+      "<ul>#{list_items}</ul>".html_safe
+    end
+
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+
+    f.inputs "Свойства" do
+
+      f.input :title
+      f.input :logo, :hint => "#{image_tag("#{f.object.logo.thumb_preview_big.url}")}".html_safe
+    end
+
+    f.inputs 'Публикации рекламодателя', :class => 'collapsed' do
+      f.input :r_blurbs,
+              :as => :check_boxes,
+              :member_label => Proc.new { |p|
+                "#{p.title} <a href='/news/#{p.slug}' target='_blank'>[view]</a> <a href='/admin/r_blurbs/#{p.slug}/edit'>[edit]</a>".html_safe
+              }
+    end
+
+    f.actions
+  end
+
+end

data/app/admin/c80_news_tz/r_blurbs.rb

@@ -0,0 +1,100 @@
+ActiveAdmin.register C80NewsTz::RBlurb, :as => 'RBlurb' do
+
+  #before_filter :skip_sidebar!, :only => :index
+
+  menu :label => 'Публикации рекламодателей', :parent => 'Содержимое сайта'
+
+  permit_params :short,
+                :title,
+                :leader_abz,
+                :full,
+                :r_bphotos_attributes => [:id, :image, :_destroy],
+                :r_advertiser_ids => [],
+                :rubric_ids => [],
+                :issue_ids => []
+
+  # controller do
+  #   cache_sweeper :suit_sweeper, :only => [:update,:create,:destroy]
+  # end
+
+  index do
+    selectable_column
+    # id_column
+    column :title
+    column :created_at do |fact|
+      local_time(fact[:created_at], format: '%e.%m.%Y')
+    end
+
+    column '' do |fact|
+      if fact.r_bphotos.count > 0
+        image_tag(fact.r_bphotos.first.image.thumb_preview_small)
+      end
+    end
+
+    column :short
+    column :rubrics do |fact|
+      # нарисуем список
+      list_items = ((fact.rubrics.map { |p|
+        "<li>#{ p.title }</li>"
+      }).join("")).html_safe
+
+      "<ul>#{list_items}</ul>".html_safe
+    end
+    column :issue do |fact|
+      # нарисуем список
+      list_items = ((fact.issues.map { |p|
+        "<li>• #{ p.number } <a href='/issues/#{p.id}' target='_blank'>[view]</a> <a href='/admin/issues/#{p.id}/edit'>[edit]</a> </li>"
+      }).join("")).html_safe
+
+      "<ul>#{list_items}</ul>".html_safe
+    end
+    # column :full
+
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+    f.inputs 'Свойства' do
+      f.input :title
+
+      f.input :rubrics,
+              :as => :check_boxes,
+              :member_label => Proc.new { |p|
+                p.title
+              }
+
+      f.input :issues,
+              :as => :check_boxes,
+              :member_label => Proc.new { |p|
+                p.number
+              }
+
+      f.input :short, :input_html => {:rows => 3, :class => 'code_area'}
+      f.input :leader_abz, :input_html => {:rows => 3, :class => 'code_area'}
+
+      f.inputs 'Картинки, вставляемые в текст публикации (первая картинка идёт в предпросмотр публикации)', :class => 'collapsed' do
+        f.has_many :r_bphotos, :allow_destroy => true do |p|
+          p.input :image,
+                       :as => :file,
+                       :hint => image_tag(p.object.image.thumb_preview_medium)
+        end
+      end
+
+      f.inputs 'Текст публикации' do
+        f.input :full, :as => :ckeditor
+      end
+
+
+      f.inputs 'Рекламодатели, связанные с публикацией' do
+        f.input :r_advertisers,
+                :as => :check_boxes,
+                :member_label => Proc.new { |p|
+                  "#{p.title} <a href='/rcompanies/#{p.slug}' target='_blank'>[view]</a> <a href='/admin/r_advertisers/#{p.slug}/edit'>[edit]</a>".html_safe
+                }
+      end
+
+    end
+    f.actions
+  end
+
+end

data/app/admin/c80_news_tz/r_lives.rb

@@ -0,0 +1,36 @@
+ActiveAdmin.register C80NewsTz::RLive, :as => 'RLive' do
+
+  menu :label => "Рекламодатель активный", :parent => 'Содержимое сайта'
+
+  before_filter :skip_sidebar!, :only => :index
+
+  permit_params :r_advertiser_ids => []
+
+  index do
+    column :r_advertisers do |loc|
+      # нарисуем список
+      list_items = ((loc.r_advertisers.map { |p|
+        "<li>#{ p.title }</li>"
+      }).join("")).html_safe
+
+      "<ul>#{list_items}</ul>".html_safe
+    end
+    actions
+  end
+
+  form(:html => {:multipart => true}) do |f|
+    f.inputs "Свойства" do
+
+      f.input :r_advertisers,
+              :as => :select,
+              :input_html => {:multiple => false},
+              :include_blank => true,
+              :member_label => Proc.new { |p|
+                p.title
+              }
+
+    end
+    f.actions
+  end
+
+end

data/app/admin/c80_news_tz/spots.rb

@@ -10,7 +10,7 @@ ActiveAdmin.register C80NewsTz::Spot, :as => 'Spot' do
 
   index do
     id_column
-    column :title
+    # column :title
 
     column :rubrics do |loc|
       # нарисуем список
@@ -26,7 +26,8 @@ ActiveAdmin.register C80NewsTz::Spot, :as => 'Spot' do
 
   form(:html => {:multipart => true}) do |f|
     f.inputs "Свойства" do
-      f.input :title
+      # f.input :title
+      f.input :id, :input_html => {:readonly => true }
 
       f.input :rubrics,
               :as => :select,

data/app/assets/javascripts/c80_news_tz/backend/companies.js

@@ -0,0 +1,3 @@
+$(document).ready(function() {
+    $('body.show.admin_companies #main_content > div > h3').text('Компания');
+});

data/app/assets/javascripts/c80_news_tz/backend/facts.js

@@ -0,0 +1,3 @@
+$(document).ready(function() {
+    $('body.show.admin_facts #main_content > div > h3').text('Публикация');
+});

data/app/assets/javascripts/c80_news_tz/backend/r_advertisers.js

@@ -0,0 +1,3 @@
+$(document).ready(function() {
+    $('body.show.admin_r_advertisers #main_content > div > h3').text('Рекламодатель');
+});

data/app/assets/javascripts/c80_news_tz/backend/r_blurbs.js

@@ -0,0 +1,3 @@
+$(document).ready(function() {
+    $('body.show.admin_r_blurbs #main_content > div > h3').text('Публикация рекламодателя');
+});

data/app/assets/javascripts/c80_news_tz/backend/rubrics.js

@@ -0,0 +1,3 @@
+$(document).ready(function() {
+    $('body.show.admin_rubrics #main_content > div > h3').text('Рубрика');
+});

data/app/assets/stylesheets/c80_news_tz/backend/locations.scss

@@ -0,0 +1,26 @@
+body.admin_locations {
+
+  &.index {
+    #titlebar_right {
+      display: none !important;
+    }
+    .table_tools {
+      display: none !important;
+    }
+    a.view_link {
+      display: none !important;
+    }
+    a.delete_link {
+      display: none !important;
+    }
+  }
+
+  &.show {
+    #titlebar_right {
+      display: none !important;
+    }
+    #main_content > div > h3 {
+      display: none;
+    }
+  }
+}

data/app/assets/stylesheets/c80_news_tz/backend/r_advertisers.scss

@@ -0,0 +1,5 @@
+body.new.admin_r_advertisers, body.edit.admin_r_advertisers {
+  li#r_advertiser_r_blurbs_input > fieldset > legend.label {
+    display: none;
+  }
+}

data/app/assets/stylesheets/c80_news_tz/backend/r_lives.scss

@@ -0,0 +1,26 @@
+body.admin_r_lives {
+
+  &.index {
+    #titlebar_right {
+      display: none !important;
+    }
+    .table_tools {
+      display: none !important;
+    }
+    a.view_link {
+      display: none !important;
+    }
+    a.delete_link {
+      display: none !important;
+    }
+  }
+
+  &.show {
+    #titlebar_right {
+      display: none !important;
+    }
+    #main_content > div > h3 {
+      display: none;
+    }
+  }
+}

data/app/assets/stylesheets/c80_news_tz/backend/spots.scss

@@ -0,0 +1,26 @@
+body.admin_spots {
+
+  &.index {
+    #titlebar_right {
+      display: none !important;
+    }
+    .table_tools {
+      display: none !important;
+    }
+    a.view_link {
+      display: none !important;
+    }
+    a.delete_link {
+      display: none !important;
+    }
+  }
+
+  &.show {
+    #titlebar_right {
+      display: none !important;
+    }
+    #main_content > div > h3 {
+      display: none;
+    }
+  }
+}

data/app/models/c80_news_tz/issue.rb

@@ -1,6 +1,7 @@
 module C80NewsTz
   class Issue < ActiveRecord::Base
     has_and_belongs_to_many :facts, :join_table => 'c80_news_tz_facts_issues'
+    has_and_belongs_to_many :r_blurbs, :join_table => 'c80_news_tz_blurbs_issues'
     has_many :pdfs, :dependent => :destroy
     accepts_nested_attributes_for :pdfs,
                                   :reject_if => lambda { |attributes|

data/app/models/c80_news_tz/r_advertiser.rb

@@ -0,0 +1,30 @@
+include ActionView::Helpers::SanitizeHelper
+require "babosa"
+
+# рекламодатель
+module C80NewsTz
+  class RAdvertiser < ActiveRecord::Base
+
+    has_and_belongs_to_many :r_lives, :join_table => 'c80_news_tz_advs_lives'
+    has_and_belongs_to_many :r_blurbs, :join_table => 'c80_news_tz_advs_blurbs'
+
+    mount_uploader :logo, RAlogoUploader
+
+    extend FriendlyId
+    friendly_id :title, use: :slugged
+
+    def normalize_friendly_id(input)
+      input.to_s.to_slug.normalize(transliterations: :russian).to_s
+    end
+
+    def slug_candidates
+      [:title] + Array.new(6) { |index| [:title, index+2] }
+    end
+
+    def should_generate_new_friendly_id?
+      slug.blank?
+      # name_changed? || super
+    end
+
+  end
+end

data/app/models/c80_news_tz/r_blurb.rb

@@ -0,0 +1,84 @@
+require "babosa"
+include ActionView::Helpers::SanitizeHelper
+
+# публикация рекламодателя
+module C80NewsTz
+  class RBlurb < ActiveRecord::Base
+    has_and_belongs_to_many :issues, :join_table => 'c80_news_tz_facts_issues'
+    has_many :r_bphotos, :dependent => :destroy
+    accepts_nested_attributes_for :r_bphotos,
+                                  :reject_if => lambda { |attributes|
+                                    !attributes.present?
+                                  },
+                                  :allow_destroy => true
+
+    has_and_belongs_to_many :issues, :join_table => 'c80_news_tz_blurbs_issues'
+    has_and_belongs_to_many :rubrics, :join_table => 'c80_news_tz_blurbs_rubrics'
+    has_and_belongs_to_many :r_advertisers, :join_table => 'c80_news_tz_advs_blurbs'
+
+    validates_with FactValidator
+    default_scope {order(:created_at => :desc)}
+
+    extend FriendlyId
+    friendly_id :title, use: :slugged
+    def normalize_friendly_id(input)
+      input.to_s.to_slug.normalize(transliterations: :russian).to_s
+    end
+
+    def slug_candidates
+      [:title] + Array.new(6) {|index| [:title, index+2]}
+    end
+
+    # TODO_MY:: используется ли метод short_meta_description?
+    def short_meta_description
+
+      if description.present? && description.length > 200
+        result = description
+      elsif full.present? && full.length > 0
+        result = strip_tags(full[0..200]+"...")
+      else
+        result = nil
+      end
+      result
+
+    end
+
+    # выдать публикации, принадлежащие указанной рубрике
+    def self.where_rubric(rubric_slug)
+      self.joins(:rubrics).where(:c80_news_tz_rubrics => {:slug => rubric_slug})
+    end    
+    
+    # выдать картинку, которая пойдёт в блок преьвю
+    def photo_preview
+      result = nil
+      if fphotos.count > 0
+        result = fphotos.first.image
+      else
+      end
+      result
+    end
+
+    # выдать строку: title первой попавшейся рубрики
+    # если таковой нету - выдаётся пустая строка
+    def rubric_title
+      result = ""
+      if rubrics.count > 0
+        result = rubrics.first.title
+      end
+      result
+    end
+
+    # выдать логотип первого попавшегося рекламодателя
+    # если чего-то нету - выдаётся nil
+    def company_logo
+      result = nil
+      if r_advertisers.count > 0
+        if r_advertisers.first.logo.present?
+          result = r_advertisers.first.logo
+        end
+      end
+      result
+    end
+
+  end
+end

data/app/models/c80_news_tz/r_bphoto.rb

@@ -0,0 +1,39 @@
+# фотография в тексте публикации рекламодателя
+module C80NewsTz
+  class RBphoto < ActiveRecord::Base
+    belongs_to :r_blurbs
+    mount_uploader :image, RBphotoUploader
+
+    # в ~ от размеров thumb-ов и page_content_width - выдать соответствующую картинку
+    # • Если у картинки thumb_big шириной ≥ page_content_width - вставляем этот thumb_big.
+    # • Иначе: вставлем thumb_small.
+    def content_image
+      img = MiniMagick::Image.open(image.thumb_big.path)
+      w = SiteProp.first.page_content_width
+      if img["width"] < w
+        image.thumb_small
+      else
+        image.thumb_big
+      end
+    end
+
+    # выдать размеры картинки, которая будет вставлена в текст страницы
+    def content_image_size
+      img = MiniMagick::Image.open(image.thumb_big.path)
+      w = SiteProp.first.page_content_width
+      if img["width"] < w
+        img = MiniMagick::Image.open(image.thumb_small.path)
+        [img["width"],img["height"]]
+      else
+        [img["width"],img["height"]]
+      end
+    end
+
+    # выдать размеры картинки thumb_preview
+    # def thumb_preview_size
+    #   img = MiniMagick::Image.open(image.thumb_preview.path)
+    #   [img["width"],img["height"]]
+    # end
+
+  end
+end

data/app/models/c80_news_tz/r_live.rb

@@ -0,0 +1,6 @@
+# Активный рекламодатель
+module C80NewsTz
+  class RLive < ActiveRecord::Base
+    has_and_belongs_to_many :r_advertisers, :join_table => 'c80_news_tz_advs_lives'
+  end
+end

data/app/models/c80_news_tz/rubric.rb

@@ -2,6 +2,8 @@ require "babosa"
 module C80NewsTz
   class Rubric < ActiveRecord::Base
     has_and_belongs_to_many :spots, :join_table => 'c80_news_tz_rubrics_spots'
+    has_and_belongs_to_many :facts, :join_table => 'c80_news_tz_facts_rubrics'
+    has_and_belongs_to_many :r_blurbs, :join_table => 'c80_news_tz_blurbs_rubrics'
 
     validates_with RubricValidator
 
@@ -16,8 +18,6 @@ module C80NewsTz
       [:title] + Array.new(6) { |index| [:title, index+2] }
     end
 
-    has_and_belongs_to_many :facts, :join_table => 'c80_news_tz_facts_rubrics'
-
     def should_generate_new_friendly_id?
       slug.blank?
       # name_changed? || super

data/app/uploaders/c80_news_tz/r_alogo_uploader.rb

@@ -0,0 +1,55 @@
+# грузит лого рекламодателя
+module C80NewsTz
+  class RAlogoUploader < CarrierWave::Uploader::Base
+
+    include CarrierWave::MiniMagick
+
+    storage :file
+
+    process :resize_to_limit => [500,500]
+
+    version :thumb_fit do
+      process :resize_to_fit => [124,124]
+    end
+
+    version :thumb_fill do
+      process :resize_to_fill => [124,74]
+    end
+
+    version :thumb_preview_small do
+      process :resize_to_fit => [80, 44]
+    end
+
+    version :thumb_preview_medium do
+      process :resize_to_fit => [80, 44]
+    end
+
+    # идёт в блок "главная публикация", что на главной
+    version :thumb_preview_big do
+      process :resize_to_fit => [124, 124]
+    end
+
+    def store_dir
+      "uploads/rec/avs/_logos/#{format("%02d", model.id)}"
+    end
+
+    def extension_white_list
+      %w(jpg jpeg gif png)
+    end
+
+    def filename
+      if original_filename
+        "logo_#{secure_token(4)}.#{file.extension}"
+      end
+    end
+
+    protected
+    def secure_token(length=16)
+      var = :"@#{mounted_as}_secure_token"
+      model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
+    end
+
+
+  end
+
+end

data/app/uploaders/c80_news_tz/r_bphoto_uploader.rb

@@ -0,0 +1,98 @@
+# грузит картинки, вставляемые в текст публикаций рекламодателей
+module C80NewsTz
+  class RBphotoUploader < CarrierWave::Uploader::Base
+
+    include CarrierWave::MiniMagick
+
+    storage :file
+
+    # При загрузке картинок генерим два thumb:
+    #   - thumb_big (resize_to_limit),
+    #   - thumb_small (resize_to_limit: w = page_content*1/3).
+
+    version :thumb_big do
+      process :resize_to_limit_big
+    end
+
+    version :thumb_small do
+      process :resize_to_limit_small
+    end
+
+    version :thumb_preview_small do
+      process :resize_to_fill => [126, 84]
+    end
+
+    version :thumb_preview_medium do
+      process :resize_to_fill => [223, 149]
+    end
+
+    # идёт в блок "главная публикация", что на главной
+    version :thumb_preview_big do
+      process :resize_to_fill => [500, 321]
+    end
+
+    def store_dir
+      "uploads/rec/blurbs/#{format("%02d", model.r_blurb_id)}"
+    end
+
+    def extension_white_list
+      %w(jpg jpeg gif png)
+    end
+
+    def filename
+      if original_filename
+        "photo_#{secure_token(4)}.#{file.extension}"
+      end
+    end
+
+    protected
+    def secure_token(length=16)
+      var = :"@#{mounted_as}_secure_token"
+      model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
+    end
+
+
+    def resize_to_limit_big
+      # puts "<PageArtUploader.resize_to_limit_big>"
+      manipulate! do |img|
+
+        w = SiteProp.first.page_content_width
+        h = calc_height_of_image(w)
+
+        img.resize "#{w}x#{h}>"
+        img = yield(img) if block_given?
+        img
+
+      end
+    end
+
+    def resize_to_limit_small
+      # puts "<PageArtUploader.resize_to_limit_small>"
+      manipulate! do |img|
+
+        w = SiteProp.first.page_content_width/3
+        h = calc_height_of_image(w)
+
+        img.resize "#{w}x#{h}>"
+        img = yield(img) if block_given?
+        img
+
+      end
+    end
+
+    private
+
+    def calc_height_of_image(w)
+      model_image = ::MiniMagick::Image.open(model.image.current_path)
+      calc_height(w, model_image["width"], model_image["height"])
+    end
+
+    # подгоняем по ширине, рассчитываем высоту
+    def calc_height(width, original_w, original_h)
+      k = width.to_f/original_w
+      original_h * k
+    end
+
+
+  end
+end

data/config/locales/ru.yml

@@ -25,6 +25,19 @@ ru:
       location:
          one: 'место'
          other: 'Места на главной под публикации'
+      r_live:
+         one: 'активного рекламодателя'
+         other: 'Активный рекламодатель'
+      r_advertiser:
+         one: 'рекламодателя'
+         other: 'Рекламодатели'
+      r_blurb:
+        one: 'публикацию рекламодателя'
+        other: 'Публикации рекламодателей'
+      c80_news_tz/r_bphoto: ""
+      spot:
+        one: 'место под рубрику на главной'
+        other: 'Рубрики на главной'
     attributes:
       c80_news_tz/notice:
         title: "Название"
@@ -73,4 +86,24 @@ ru:
         facts: 'Публикации'
       c80_news_tz/location:
         title: 'Название'
-        facts: 'Публикация'
+        facts: 'Публикация'
+      c80_news_tz/r_live:
+        title: 'Название'
+        r_advertisers: 'Рекламодатель'
+      c80_news_tz/r_advertiser:
+        title: 'Название'
+        logo: 'Лого'
+        r_blurbs: 'Публикации'
+      c80_news_tz/r_blurb:
+        title: 'Заголовок'
+        created_at: 'Дата создания'
+        short: 'Кратко'
+        rubrics: 'Рубрики'
+        issues: 'Номер'
+        issue: 'Номер'
+        leader_abz: 'Лидер абзац'
+        full: ''
+        r_advertisers: ''
+      c80_news_tz/spot:
+        title: 'Название'
+        rubrics: 'Рубрика'

data/db/migrate/20160309130000_create_lives.rb

@@ -0,0 +1,11 @@
+# активный рекламодатель
+class CreateLives < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_r_lives, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :title
+      t.string :tag
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20160309132020_create_advertisers.rb

@@ -0,0 +1,12 @@
+# рекламодатель
+class CreateAdvertisers < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_r_advertisers, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :title
+      t.string :slug
+      t.string :logo
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20160309134444_create_join_table_advertisers_lives.rb

@@ -0,0 +1,12 @@
+class CreateJoinTableAdvertisersLives < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_advs_lives, :id => false do |t|
+      t.integer :r_advertiser_id, :null => false
+      t.integer :r_live_id, :null => false
+    end
+
+    # Add table index
+    add_index :c80_news_tz_advs_lives, [:r_advertiser_id, :r_live_id], :unique => true
+
+  end
+end

data/db/migrate/20160309145050_create_blurbs.rb

@@ -0,0 +1,14 @@
+class CreateBlurbs < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_r_blurbs, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :title
+      t.string :sub_title
+      t.text :short
+      t.text :leader_abz
+      t.text :full
+      t.string :slug
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20160309150808_create_join_table_blurbs_rubrics.rb

@@ -0,0 +1,12 @@
+class CreateJoinTableBlurbsRubrics < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_blurbs_rubrics, :id => false do |t|
+      t.integer :r_blurb_id, :null => false
+      t.integer :rubric_id, :null => false
+    end
+
+    # Add table index
+    add_index :c80_news_tz_blurbs_rubrics, [:r_blurb_id, :rubric_id], :unique => true
+
+  end
+end

data/db/migrate/20160309151313_create_join_table_advertisers_blurbs.rb

@@ -0,0 +1,12 @@
+class CreateJoinTableAdvertisersBlurbs < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_advs_blurbs, :id => false do |t|
+      t.integer :r_advertiser_id, :null => false
+      t.integer :r_blurb_id, :null => false
+    end
+
+    # Add table index
+    add_index :c80_news_tz_advs_blurbs, [:r_advertiser_id, :r_blurb_id], :unique => true
+
+  end
+end

data/db/migrate/20160309154848_create_bphotos.rb

@@ -0,0 +1,10 @@
+class CreateBphotos < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_r_bphotos, :options => 'COLLATE=utf8_unicode_ci' do |t|
+      t.string :image
+      t.references :r_blurb, :index => true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20160309165151_create_join_table_blurbs_issues.rb

@@ -0,0 +1,12 @@
+class CreateJoinTableBlurbsIssues < ActiveRecord::Migration
+  def change
+    create_table :c80_news_tz_blurbs_issues, :id => false do |t|
+      t.integer :issue_id, :null => false
+      t.integer :r_blurb_id, :null => false
+    end
+
+    # Add table index
+    add_index :c80_news_tz_blurbs_issues, [:issue_id, :r_blurb_id], :unique => true
+
+  end
+end

data/lib/c80_news_tz/version.rb

@@ -1,3 +1,3 @@
 module C80NewsTz
-  VERSION = "0.1.1.18"
+  VERSION = "0.1.1.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_news_tz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.18
+  version: 0.1.1.19
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,18 +99,30 @@ files:
 - app/admin/c80_news_tz/issues.rb
 - app/admin/c80_news_tz/locations.rb
 - app/admin/c80_news_tz/notices.rb
+- app/admin/c80_news_tz/r_advertisers.rb
+- app/admin/c80_news_tz/r_blurbs.rb
+- app/admin/c80_news_tz/r_lives.rb
 - app/admin/c80_news_tz/rubrics.rb
 - app/admin/c80_news_tz/spots.rb
 - app/assets/images/c80_news_tz/.keep
 - app/assets/javascripts/c80_news_tz/application.js.coffee
 - app/assets/javascripts/c80_news_tz/backend.js.coffee
 - app/assets/javascripts/c80_news_tz/backend/collapsable-groups.js
+- app/assets/javascripts/c80_news_tz/backend/companies.js
+- app/assets/javascripts/c80_news_tz/backend/facts.js
+- app/assets/javascripts/c80_news_tz/backend/r_advertisers.js
+- app/assets/javascripts/c80_news_tz/backend/r_blurbs.js
+- app/assets/javascripts/c80_news_tz/backend/rubrics.js
 - app/assets/javascripts/c80_news_tz/frontend/facts_ajax.js
 - app/assets/stylesheets/c80_news_tz/application.scss
 - app/assets/stylesheets/c80_news_tz/backend.scss
 - app/assets/stylesheets/c80_news_tz/backend/collapsed.scss
 - app/assets/stylesheets/c80_news_tz/backend/companies.scss
+- app/assets/stylesheets/c80_news_tz/backend/locations.scss
 - app/assets/stylesheets/c80_news_tz/backend/notices.scss
+- app/assets/stylesheets/c80_news_tz/backend/r_advertisers.scss
+- app/assets/stylesheets/c80_news_tz/backend/r_lives.scss
+- app/assets/stylesheets/c80_news_tz/backend/spots.scss
 - app/assets/stylesheets/c80_news_tz/frontend/pubs_medium.scss
 - app/controllers/c80_news_tz/application_controller.rb
 - app/helpers/c80_news_tz/application_helper.rb
@@ -130,6 +142,10 @@ files:
 - app/models/c80_news_tz/nphoto.rb
 - app/models/c80_news_tz/pdf.rb
 - app/models/c80_news_tz/prop.rb
+- app/models/c80_news_tz/r_advertiser.rb
+- app/models/c80_news_tz/r_blurb.rb
+- app/models/c80_news_tz/r_bphoto.rb
+- app/models/c80_news_tz/r_live.rb
 - app/models/c80_news_tz/rubric.rb
 - app/models/c80_news_tz/rubric_validator.rb
 - app/models/c80_news_tz/spot.rb
@@ -139,6 +155,8 @@ files:
 - app/uploaders/c80_news_tz/gphoto_uploader.rb
 - app/uploaders/c80_news_tz/nphoto_uploader.rb
 - app/uploaders/c80_news_tz/pdf_uploader.rb
+- app/uploaders/c80_news_tz/r_alogo_uploader.rb
+- app/uploaders/c80_news_tz/r_bphoto_uploader.rb
 - app/views/c80_news_tz/application/guru.js.erb
 - app/views/layouts/c80_news_tz/application.html.erb
 - app/views/shared/_fact.html.erb
@@ -170,6 +188,14 @@ files:
 - db/migrate/20160304145555_create_join_table_facts_locations.rb
 - db/migrate/20160307075757_create_spots.rb
 - db/migrate/20160307075858_create_join_table_rubrics_spots.rb
+- db/migrate/20160309130000_create_lives.rb
+- db/migrate/20160309132020_create_advertisers.rb
+- db/migrate/20160309134444_create_join_table_advertisers_lives.rb
+- db/migrate/20160309145050_create_blurbs.rb
+- db/migrate/20160309150808_create_join_table_blurbs_rubrics.rb
+- db/migrate/20160309151313_create_join_table_advertisers_blurbs.rb
+- db/migrate/20160309154848_create_bphotos.rb
+- db/migrate/20160309165151_create_join_table_blurbs_issues.rb
 - db/seeds/19_fill_news_props.rb.example
 - db/seeds/20_fill_rubrics.rb.example
 - db/seeds/21_fill_facts.rb.example