diff --git a/vendor/built_in_modules/videos/app/controllers/panel/videos/back_end/channel_videos_controller.rb b/vendor/built_in_modules/videos/app/controllers/panel/videos/back_end/channel_videos_controller.rb
index 77b851f88..5f716287f 100644
--- a/vendor/built_in_modules/videos/app/controllers/panel/videos/back_end/channel_videos_controller.rb
+++ b/vendor/built_in_modules/videos/app/controllers/panel/videos/back_end/channel_videos_controller.rb
@@ -13,6 +13,17 @@ class Panel::Videos::BackEnd::ChannelVideosController < OrbitBackendController
end
end
+ def show
+ @video = ChannelVideo.find(params[:id])
+ client = YouTubeIt::Client.new(:dev_key => "AI39si5KGPg8rhKLBfmeukit2tCSP_B9lT8igiNICbrbgUXQoAdYGvsyCGCmO1wGnr1OW4bDRv-ESolwk-rdBNIAgVTL9VYaEA")
+ @client_videos = client.videos_by(:user => 'ntuprs', :per_page => 5)
+
+ respond_to do |format|
+ format.html
+ format.json { render json: @location }
+ end
+ end
+
def new
@video = ChannelVideo.new
end
diff --git a/vendor/built_in_modules/videos/app/controllers/panel/videos/widget/channel_videos_controller.rb b/vendor/built_in_modules/videos/app/controllers/panel/videos/widget/channel_videos_controller.rb
new file mode 100644
index 000000000..ca3f0f040
--- /dev/null
+++ b/vendor/built_in_modules/videos/app/controllers/panel/videos/widget/channel_videos_controller.rb
@@ -0,0 +1,75 @@
+class Panel::Announcement::Widget::VideosController < OrbitWidgetController
+ def initialize
+ super
+ @app_title = 'videos'
+ end
+
+ # GET /bulletins
+ # GET /bulletins.xml
+
+ def index
+
+ # @part = PagePart.find(params[:part_id])
+
+ # if @part.widget_data_count
+ # @page_num = @part.widget_data_count
+ # else
+ # @page_num = 4
+ # end
+
+ # if @part.widget_field
+ # @widget_fields = @part.widget_field
+ # else
+ # @widget_fields = []
+ # end
+
+ # @title = params[:part_title]
+
+ # @widget_style = @part.widget_style
+
+ # @category_id = @part.category
+
+ # date_now = Time.now
+ # if !@category_id.blank?
+ # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:bulletin_category_id => @category_id).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page] ).per(@page_num)
+ # @current_category = BulletinCategory.from_id(@category_id) rescue nil
+ # elsif !params[:tag_id].blank?
+ # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page] ).per(@page_num)
+ # else
+ # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page] ).per(@page_num)
+ # end
+
+ # get_categorys
+
+ end
+
+ # def bulletins_list_and_pic
+
+ # if params[:widget_data_count]
+ # @page_num = params[:widget_data_count];
+ # else
+ # @page_num = 4;
+ # end
+
+ # @title = params[:part_title]
+ # date_now = Time.now
+ # if !params[:category_id].blank?
+ # @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(@page_num )
+ # @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
+ # elsif !params[:tag_id].blank?
+ # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page] ).per(@page_num)
+ # else
+ # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(@page_num )
+ # end
+
+ # get_categorys
+
+ # end
+
+ # def reload_bulletins
+ # @selected_tag = Tag.find(params[:tag_id])
+ # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).where(:is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, sort).page(params[:page]).per(5) rescue nil
+ # end
+
+
+end
diff --git a/vendor/built_in_modules/videos/app/views/panel/videos/back_end/channel_videos/_form.html.erb b/vendor/built_in_modules/videos/app/views/panel/videos/back_end/channel_videos/_form.html.erb
index cec48cf2c..e5ee7be31 100644
--- a/vendor/built_in_modules/videos/app/views/panel/videos/back_end/channel_videos/_form.html.erb
+++ b/vendor/built_in_modules/videos/app/views/panel/videos/back_end/channel_videos/_form.html.erb
@@ -1,7 +1,9 @@
-
<%= t 'title' %>
+
<%= t "name" %>
- <%= f.text_field :channel_name, :class=>"span2", :placeholder => "Channel Name" %>
+ <%= f.fields_for :name_translations do |f| %>
+ <%= f.text_field locale, :class=>'span4', :value => (@location_info.name_translations[locale.to_s] rescue nil) %>
+ <% end %>
<%= @vd.embed_html(400, 300).html_safe %>
<%= @vd.title %>
+ <%= link_to 'Show', panel_videos_back_end_channel_video_path(video) %>
<%if is_manager? %>
<%= link_to 'Edit', edit_panel_videos_back_end_channel_video_path(video) %>
<%= link_to 'Destroy', panel_videos_back_end_channel_video_path(video), method: :delete , :confirm => t(:sure?) %>
diff --git a/vendor/built_in_modules/videos/app/views/panel/videos/back_end/channel_videos/show.html.erb b/vendor/built_in_modules/videos/app/views/panel/videos/back_end/channel_videos/show.html.erb
new file mode 100644
index 000000000..1e7bd2af0
--- /dev/null
+++ b/vendor/built_in_modules/videos/app/views/panel/videos/back_end/channel_videos/show.html.erb
@@ -0,0 +1,7 @@
+<% @client_videos.videos.each do |v| %>
+
+ <% @video = v.video_id.split(/tag:youtube.com,2008:video:+/).last %>
+ <% @vd = UnvlogIt.new("https://www.youtube.com/watch?v=#{@video}")%>
+ <%= @vd.embed_html(400, 300).html_safe %>
+ <%= @vd.title %>
+ <%end%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/videos/app/views/panel/videos/widget/videos/_videos.html.erb b/vendor/built_in_modules/videos/app/views/panel/videos/widget/videos/_videos.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/videos/config/locales/en.yml b/vendor/built_in_modules/videos/config/locales/en.yml
index c3f05cf27..83c87731a 100644
--- a/vendor/built_in_modules/videos/config/locales/en.yml
+++ b/vendor/built_in_modules/videos/config/locales/en.yml
@@ -1,4 +1,5 @@
en:
video:
video: Video
- videos: Videos
\ No newline at end of file
+ videos: Videos
+ channel: Channel
\ No newline at end of file
diff --git a/vendor/built_in_modules/videos/init.rb b/vendor/built_in_modules/videos/init.rb
index 13b2b1cfd..49ae90d86 100644
--- a/vendor/built_in_modules/videos/init.rb
+++ b/vendor/built_in_modules/videos/init.rb
@@ -38,6 +38,12 @@ module Videos
head_link_path "panel_videos_back_end_videos_path"
+ context_link 'video.channel',
+ :link_path=>"panel_videos_back_end_channel_videos_path" ,
+ :priority=>1,
+ :active_for_action=>{:channel_videos=>:index},
+ :available_for => [:manager]
+
end
end
end