First version of new preview. Only plain text
This commit is contained in:
1 parent
ecb3b5b25c
commit
671f86b612
14 files changed
+100
-14
No files matched your search
+8
@@ -11,6 +11,14 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
# before_filter :for_admin_only,:only => [:]
|
||||
# before_filter :for_app_manager,:only => [:index,:show,]
|
||||
before_filter :for_app_sub_manager,:except => [:index,:show,:get_sorted_and_filtered_bulletins]
|
||||
|
||||
def preview
|
||||
debugger
|
||||
a=1
|
||||
|
||||
@bulletin = Bulletin.new_preview(params[:bulletin])
|
||||
end
|
||||
|
||||
def index
|
||||
# @bulletins = Bulletin.all
|
||||
# @bulletins = Bulletin.desc("postdate desc")
|
||||
|
||||
@@ -9,11 +9,7 @@ class Bulletin
|
||||
|
||||
BelongsToCategory = :bulletin_category
|
||||
include OrbitCoreLib::BelongsToCategoryMayDisable
|
||||
|
||||
# include NccuSearch
|
||||
|
||||
#scope :searchable,where(:is_checked=>true,:is_hidden=>false,:is_pending=>false)
|
||||
|
||||
include OrbitCoreLib::Preview
|
||||
is_impressionable :counter_cache => { :column_name => :view_count }
|
||||
|
||||
field :title, localize: true
|
||||
@@ -36,7 +32,6 @@ class Bulletin
|
||||
field :is_checked, :type => Boolean, :default => false
|
||||
field :is_pending, :type => Boolean, :default => true
|
||||
field :is_rejected, :type => Boolean, :default => false
|
||||
|
||||
field :view_count, :type => Integer, :default => 0
|
||||
|
||||
field :not_checked_reason
|
||||
|
||||
Vendored
+5
-1
@@ -10,7 +10,10 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
|
||||
controller.get_unit_list
|
||||
end
|
||||
|
||||
|
||||
def preview
|
||||
@preview_obj = Preview.create(:object=>params[:news_bulletin],:expired_at=>DateTime.now+30.minutes,:preview_at_link=>"panel_news_front_end_news_bulletin_path",:object_class_type=>"NewsBulletin")
|
||||
end
|
||||
|
||||
def index
|
||||
# @news_bulletins = NewsBulletin.all
|
||||
# @news_bulletins = NewsBulletin.desc("postdate desc")
|
||||
@@ -117,6 +120,7 @@ class Panel::News::BackEnd::NewsBulletinsController < OrbitBackendController
|
||||
# POST /news_bulletins
|
||||
# POST /news_bulletins.xml
|
||||
def create
|
||||
binding.pry
|
||||
get_tags
|
||||
|
||||
if params[:news_bulletin_link]
|
||||
|
||||
Vendored
+2
-1
@@ -69,7 +69,8 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController
|
||||
end
|
||||
|
||||
def preview_content
|
||||
@news_bulletin = NewsBulletin.find params[:id]
|
||||
@news_bulletin = NewsBulletin.find params[:id] rescue nil
|
||||
@news_bulletin = Preview.find(params[:id]).get_virtual_object if @news_bulletin.nil?
|
||||
get_categorys
|
||||
end
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ class NewsBulletin
|
||||
|
||||
BelongsToCategory = :news_bulletin_category
|
||||
include OrbitCoreLib::BelongsToCategoryMayDisable
|
||||
include OrbitCoreLib::Preview
|
||||
# include Tire::Model::Search
|
||||
# include Tire::Model::Callbacks
|
||||
# include Redis::Objects
|
||||
@@ -36,7 +37,6 @@ class NewsBulletin
|
||||
field :is_checked, :type => Boolean, :default => false
|
||||
field :is_pending, :type => Boolean, :default => true
|
||||
field :is_rejected, :type => Boolean, :default => false
|
||||
|
||||
field :view_count, :type => Integer, :default => 0
|
||||
|
||||
field :not_checked_reason
|
||||
|
||||
Vendored
+2
-2
@@ -1,11 +1,11 @@
|
||||
<div class="modal hide fade in banner-preview" id="<%= news_bulletin.id %>">
|
||||
<div class="modal hide fade in banner-preview" id="<%= @preview_obj.id %>">
|
||||
<div class="modal-header">
|
||||
<a class="close" data-dismiss="modal">×</a>
|
||||
<h3><%= t("modal.preview") %></h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p class="news_bulletin_slideshow">
|
||||
<iframe src=<%= panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => (news_bulletin.news_bulletin_category.id rescue ""),:preview=>true) %> style="width:1024px;height:300px" >
|
||||
<iframe src=<%= @preview_obj.get_preview_link %> style="width:1024px;height:300px" >
|
||||
|
||||
</iframe>
|
||||
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
$('#show_preview').html('<%=escape_javascript(render :partial=>"modal_preview",:locals=>{:news_bulletin => @preview_news_bulletin}) %>');
|
||||
var start_modal_with_id = "<%= @preview_news_bulletin.id %>";
|
||||
$('#show_preview').html('<%=escape_javascript(render :partial=>"modal_preview") %>');
|
||||
var start_modal_with_id = "<%= @preview_obj.id %>";
|
||||
$("#"+start_modal_with_id).css("width","1050px");
|
||||
$("#"+start_modal_with_id).css("height","768px");
|
||||
$("#"+start_modal_with_id).css("margin","-270px 0 0 -550px");
|
||||
Reference in new issue
Block a user