Add 'mod/videolist/' from commit '17d7adcb317d25e37d3091e94b66e3f16de54196'

git-subtree-dir: mod/videolist
git-subtree-mainline: 4cf4e4d3969ab43978c95f88238547530b01422d
git-subtree-split: 17d7adcb317d25e37d3091e94b66e3f16de54196

diff --cc mod/videolist/.gitignore
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..339142537435dfdf95a8fd3856b5865b37214110
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mod/videolist/.gitignore
@@@ -1,0 -1,0 +1,15 @@@
++# ignore IDE/hidden/testing/OS cache files
++.*
++*~
++/nbproject
++/nb-configuration.xml
++Session.vim
++*.tmproj
++*.tmproject
++tmtags
++Thumbs.db
++Desktop.ini
++/JsTestDriver-*.jar
++
++# don't ignore travis config
++!/.travis.yml

diff --cc mod/videolist/CHANGES.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9a55a443f428981aaf59bcd9cda8a5f83a7a01e5
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mod/videolist/CHANGES.txt
@@@ -1,0 -1,0 +1,14 @@@
++Version 1.8.1
++(November 8, 2013 from https://github.com/lorea/videolist.git)
++
++ Enhancements
++  * Setting responsive dimensions.
++  * Making video thumbnails faster (thanks to ura soul).
++  * Do not display watching video in sidebar (thanks to ura soul).
++
++ Bugfixes
++  * Using https instead http in embeded videos.
++
++Version 1.8.0 (Foxglove)
++(September 13th, 2013 from git://github.com/lorea/videolist.git)
++

diff --cc mod/videolist/actions/videolist/delete.php
index 0000000000000000000000000000000000000000,0b9724c52c92d2bb97462a37f53585971cd5f792..0b9724c52c92d2bb97462a37f53585971cd5f792
mode 000000,100644..100644
--- /dev/null
--- 2/actions/videolist/delete.php
+++ b/mod/videolist/actions/videolist/delete.php

diff --cc mod/videolist/actions/videolist/edit.php
index 0000000000000000000000000000000000000000,a5e6ea453b8b9bd60017645943aec538f18c9b45..a5e6ea453b8b9bd60017645943aec538f18c9b45
mode 000000,100644..100644
--- /dev/null
--- 2/actions/videolist/edit.php
+++ b/mod/videolist/actions/videolist/edit.php

diff --cc mod/videolist/graphics/_videolist_icon_medium.png
index 0000000000000000000000000000000000000000,9cfc50fd899e7b4aca01a3c1b83679cd6f1a592d..9cfc50fd899e7b4aca01a3c1b83679cd6f1a592d
mode 000000,100644..100644
Binary files differ

diff --cc mod/videolist/graphics/videolist_icon_medium.png
index 0000000000000000000000000000000000000000,e567c70edf1fc789503588d779224bca305b5f84..e567c70edf1fc789503588d779224bca305b5f84
mode 000000,100644..100644
Binary files differ

diff --cc mod/videolist/graphics/videolist_icon_small.png
index 0000000000000000000000000000000000000000,507260f28ccccfd7be59d2a3a02ef3010b077351..507260f28ccccfd7be59d2a3a02ef3010b077351
mode 000000,100644..100644
Binary files differ

diff --cc mod/videolist/graphics/videolist_icon_tiny.png
index 0000000000000000000000000000000000000000,2ea6e05f480f3b6a5aa206652b7c196a3b50e0b8..2ea6e05f480f3b6a5aa206652b7c196a3b50e0b8
mode 000000,100644..100644
Binary files differ

diff --cc mod/videolist/languages/ca.php
index 0000000000000000000000000000000000000000,289c1f44a6a3c1f9d11cf202bf5a1c3e19ccfb8c..289c1f44a6a3c1f9d11cf202bf5a1c3e19ccfb8c
mode 000000,100644..100644
--- /dev/null
--- 2/languages/ca.php
+++ b/mod/videolist/languages/ca.php

diff --cc mod/videolist/languages/en.php
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d357725a77d2b7522279715a5397212810871d4f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/mod/videolist/languages/en.php
@@@ -1,0 -1,0 +1,78 @@@
++<?php
++/**
++ * Elgg videolist english language pack.
++ *
++ * @package ElggVideolist
++ */
++ 
++$english = array(
++
++      /**
++       * Menu items and titles
++       */
++
++      'videolist' => "Videos",
++      'videolist:owner' => "%s's videos",
++      'videolist:friends' => "Friends' videos",
++      'videolist:all' => "All site videos",
++      'videolist:add' => "Add a video",
++
++      'videolist:group' => "Group videos",
++      'groups:enablevideolist' => 'Enable group videos',
++
++      'videolist:edit' => "Edit this video",
++      'videolist:delete' => "Delete this video",
++
++      'videolist:new' => "Add a video",
++      'videolist:notification' =>
++'%s added a new video:
++
++%s
++%s
++
++View and comment on the new video:
++%s
++',
++      'videolist:delete:confirm' => 'Are you sure you want to delete this video?',
++      'item:object:videolist_item' => 'Video',
++      'videolist:nogroup' => 'This group does not have any video yet',
++      'videolist:more' => 'More videos',
++      'videolist:none' => 'No videos posted yet.',
++
++      /**
++      * River
++      **/
++
++      'river:create:object:videolist_item' => '%s created the video %s',
++      'river:update:object:videolist_item' => '%s updated the video %s',
++      'river:comment:object:videolist_item' => '%s commented on the video titled %s',
++
++      /**
++       * Form fields
++       */
++
++      'videolist:title' => 'Title',
++      'videolist:description' => 'Description',
++      'videolist:video_url' => 'Enter video URL',
++      'videolist:access_id' => 'Who can see you posted this video?',
++      'videolist:tags' => 'Add tags',
++
++      /**
++       * Status and error messages
++       */
++      'videolist:error:no_save' => 'There was an error in saving the video, please try after sometime',
++      'videolist:saved' => 'Your video has been saved successfully!',
++      'videolist:deleted' => 'Your video was removed successfully!',
++      'videolist:deletefailed' => 'Unfortunately, this video could not be removed now. Please try again later',
++      
++
++      /**
++       * Widget
++       **/
++
++      'videolist:num_videos' => 'Number of videos to display',
++      'videolist:widget:description' => 'Your personal video playlist.',
++      
++);
++
++add_translation("en", $english);

diff --cc mod/videolist/languages/es.php
index 0000000000000000000000000000000000000000,ad8cbe46cbefee95e940d29732c3b3454cc7561d..ad8cbe46cbefee95e940d29732c3b3454cc7561d
mode 000000,100644..100644
--- /dev/null
--- 2/languages/es.php
+++ b/mod/videolist/languages/es.php

diff --cc mod/videolist/languages/fr.php
index 0000000000000000000000000000000000000000,c2149554603c407c4d2c5f591a534a7fa41c826b..c2149554603c407c4d2c5f591a534a7fa41c826b
mode 000000,100644..100644
--- /dev/null
--- 2/languages/fr.php
+++ b/mod/videolist/languages/fr.php

diff --cc mod/videolist/languages/gl.php
index 0000000000000000000000000000000000000000,90444e3fa97bae33052b75ec3bfcabd0a3047b66..90444e3fa97bae33052b75ec3bfcabd0a3047b66
mode 000000,100644..100644
--- /dev/null
--- 2/languages/gl.php
+++ b/mod/videolist/languages/gl.php

diff --cc mod/videolist/languages/pt.php
index 0000000000000000000000000000000000000000,e8b28c18287da49540a5cbc0e1ef51a0b67316e0..e8b28c18287da49540a5cbc0e1ef51a0b67316e0
mode 000000,100644..100644
--- /dev/null
--- 2/languages/pt.php
+++ b/mod/videolist/languages/pt.php

diff --cc mod/videolist/lib/Videolist/Platform/Bliptv.php
index 0000000000000000000000000000000000000000,62cefbd3960342b335a5d8023f8f6e1dc47c977e..62cefbd3960342b335a5d8023f8f6e1dc47c977e
mode 000000,100644..100644
--- /dev/null
--- 2/lib/Videolist/Platform/Bliptv.php
+++ b/mod/videolist/lib/Videolist/Platform/Bliptv.php

diff --cc mod/videolist/lib/Videolist/Platform/Gisstv.php
index 0000000000000000000000000000000000000000,b7989844996016e980c91e230c957c8018ace524..b7989844996016e980c91e230c957c8018ace524
mode 000000,100644..100644
--- /dev/null
--- 2/lib/Videolist/Platform/Gisstv.php
+++ b/mod/videolist/lib/Videolist/Platform/Gisstv.php

diff --cc mod/videolist/lib/Videolist/Platform/Metacafe.php
index 0000000000000000000000000000000000000000,74a346b348e3eb77ed45410fea6eb746995d412f..74a346b348e3eb77ed45410fea6eb746995d412f
mode 000000,100644..100644
--- /dev/null
--- 2/lib/Videolist/Platform/Metacafe.php
+++ b/mod/videolist/lib/Videolist/Platform/Metacafe.php

diff --cc mod/videolist/lib/Videolist/Platform/Vimeo.php
index 0000000000000000000000000000000000000000,6930cdb2d55b46da75d479b4a19ac34e01838966..6930cdb2d55b46da75d479b4a19ac34e01838966
mode 000000,100644..100644
--- /dev/null
--- 2/lib/Videolist/Platform/Vimeo.php
+++ b/mod/videolist/lib/Videolist/Platform/Vimeo.php

diff --cc mod/videolist/lib/Videolist/Platform/Youtube.php
index 0000000000000000000000000000000000000000,31a4bc95052872e2c2b91598c5fb763f5433d663..31a4bc95052872e2c2b91598c5fb763f5433d663
mode 000000,100644..100644
--- /dev/null
--- 2/lib/Videolist/Platform/Youtube.php
+++ b/mod/videolist/lib/Videolist/Platform/Youtube.php

diff --cc mod/videolist/lib/Videolist/PlatformInterface.php
index 0000000000000000000000000000000000000000,25ca019e9cdf4017a8286308bdf05f52df6f860a..25ca019e9cdf4017a8286308bdf05f52df6f860a
mode 000000,100644..100644
--- /dev/null
--- 2/lib/Videolist/PlatformInterface.php
+++ b/mod/videolist/lib/Videolist/PlatformInterface.php

diff --cc mod/videolist/lib/videolist.php
index 0000000000000000000000000000000000000000,b86db99cf56bfa3c999a9c288a05543af0278250..b86db99cf56bfa3c999a9c288a05543af0278250
mode 000000,100644..100644
--- /dev/null
--- 2/lib/videolist.php
+++ b/mod/videolist/lib/videolist.php

diff --cc mod/videolist/manifest.xml
index 0000000000000000000000000000000000000000,08539650adf4575d9ac5ae869de7039d6a132d7a..08539650adf4575d9ac5ae869de7039d6a132d7a
mode 000000,100644..100644
--- /dev/null
--- 2/manifest.xml
+++ b/mod/videolist/manifest.xml

diff --cc mod/videolist/pages/videolist/add.php
index 0000000000000000000000000000000000000000,6dd6a2f1fd29725b47bb123cadbd262dddf8161d..6dd6a2f1fd29725b47bb123cadbd262dddf8161d
mode 000000,100644..100644
--- /dev/null
--- 2/pages/videolist/add.php
+++ b/mod/videolist/pages/videolist/add.php

diff --cc mod/videolist/pages/videolist/all.php
index 0000000000000000000000000000000000000000,6fe68f3eb955d4f01de3a590a787a36f66e09ef6..6fe68f3eb955d4f01de3a590a787a36f66e09ef6
mode 000000,100644..100644
--- /dev/null
--- 2/pages/videolist/all.php
+++ b/mod/videolist/pages/videolist/all.php

diff --cc mod/videolist/pages/videolist/edit.php
index 0000000000000000000000000000000000000000,916d9d28045d1417c5c0e494c6b72f5132ad2c4a..916d9d28045d1417c5c0e494c6b72f5132ad2c4a
mode 000000,100644..100644
--- /dev/null
--- 2/pages/videolist/edit.php
+++ b/mod/videolist/pages/videolist/edit.php

diff --cc mod/videolist/pages/videolist/friends.php
index 0000000000000000000000000000000000000000,8bbb34698afce3e0af7500a301781baa5af0f033..8bbb34698afce3e0af7500a301781baa5af0f033
mode 000000,100644..100644
--- /dev/null
--- 2/pages/videolist/friends.php
+++ b/mod/videolist/pages/videolist/friends.php

diff --cc mod/videolist/pages/videolist/owner.php
index 0000000000000000000000000000000000000000,74917354e1ef20f0dcf516d3c94f4451b354b3a5..74917354e1ef20f0dcf516d3c94f4451b354b3a5
mode 000000,100644..100644
--- /dev/null
--- 2/pages/videolist/owner.php
+++ b/mod/videolist/pages/videolist/owner.php

diff --cc mod/videolist/pages/videolist/watch.php
index 0000000000000000000000000000000000000000,3a740f396ca39ad288735c12bea02502e132bc0c..3a740f396ca39ad288735c12bea02502e132bc0c
mode 000000,100644..100644
--- /dev/null
--- 2/pages/videolist/watch.php
+++ b/mod/videolist/pages/videolist/watch.php

diff --cc mod/videolist/start.php
index 0000000000000000000000000000000000000000,6f94b97d0630fd0fe3b9f5076f466ac5b83d53cb..6f94b97d0630fd0fe3b9f5076f466ac5b83d53cb
mode 000000,100644..100644
--- /dev/null
--- 2/start.php
+++ b/mod/videolist/start.php

diff --cc mod/videolist/thumbnail.php
index 0000000000000000000000000000000000000000,7a4ca8b6c2addd67fff421bb1f4bb9c66b8c533f..7a4ca8b6c2addd67fff421bb1f4bb9c66b8c533f
mode 000000,100644..100644
--- /dev/null
--- 2/thumbnail.php
+++ b/mod/videolist/thumbnail.php

diff --cc mod/videolist/upgrades/2012022501.php
index 0000000000000000000000000000000000000000,f832c8033da650ec7e995bb599b40fbc9ff472d2..f832c8033da650ec7e995bb599b40fbc9ff472d2
mode 000000,100644..100644
--- /dev/null
--- 2/upgrades/2012022501.php
+++ b/mod/videolist/upgrades/2012022501.php

diff --cc mod/videolist/views/default/forms/videolist/edit.php
index 0000000000000000000000000000000000000000,18fb6ded42a1bcb743bf3b48e0261d7e3d32bc6f..18fb6ded42a1bcb743bf3b48e0261d7e3d32bc6f
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/forms/videolist/edit.php
+++ b/mod/videolist/views/default/forms/videolist/edit.php

diff --cc mod/videolist/views/default/icon/object/videolist_item.php
index 0000000000000000000000000000000000000000,24a5b5fe82b82c424ad20e3a5822fe90576dddca..24a5b5fe82b82c424ad20e3a5822fe90576dddca
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/icon/object/videolist_item.php
+++ b/mod/videolist/views/default/icon/object/videolist_item.php

diff --cc mod/videolist/views/default/object/videolist_item.php
index 0000000000000000000000000000000000000000,5789c84759bdb196935330c90a7111804cdecfe6..5789c84759bdb196935330c90a7111804cdecfe6
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/object/videolist_item.php
+++ b/mod/videolist/views/default/object/videolist_item.php

diff --cc mod/videolist/views/default/page/elements/videolist_block.php
index 0000000000000000000000000000000000000000,a0653a09e53fa9c84c46e284ab58680c533cf7e2..a0653a09e53fa9c84c46e284ab58680c533cf7e2
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/page/elements/videolist_block.php
+++ b/mod/videolist/views/default/page/elements/videolist_block.php

diff --cc mod/videolist/views/default/river/object/videolist_item/create.php
index 0000000000000000000000000000000000000000,ea9f8394be84d8855d42b79eb03f9057cc223eae..ea9f8394be84d8855d42b79eb03f9057cc223eae
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/river/object/videolist_item/create.php
+++ b/mod/videolist/views/default/river/object/videolist_item/create.php

diff --cc mod/videolist/views/default/videolist/css.php
index 0000000000000000000000000000000000000000,625935451310435a30b1ed29c1f9013023b0e5a0..625935451310435a30b1ed29c1f9013023b0e5a0
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/videolist/css.php
+++ b/mod/videolist/views/default/videolist/css.php

diff --cc mod/videolist/views/default/videolist/group_module.php
index 0000000000000000000000000000000000000000,0e0a1ab630eff5b0ea92c5b1979970a4dc5daaab..0e0a1ab630eff5b0ea92c5b1979970a4dc5daaab
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/videolist/group_module.php
+++ b/mod/videolist/views/default/videolist/group_module.php

diff --cc mod/videolist/views/default/videolist/sidebar.php
index 0000000000000000000000000000000000000000,4a9e1cdda145e2ebb421a2933dafc24cef6273e1..4a9e1cdda145e2ebb421a2933dafc24cef6273e1
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/videolist/sidebar.php
+++ b/mod/videolist/views/default/videolist/sidebar.php

diff --cc mod/videolist/views/default/videolist/watch.php
index 0000000000000000000000000000000000000000,2e1dbacec95039861d9dff9159492aa59118d1c8..2e1dbacec95039861d9dff9159492aa59118d1c8
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/videolist/watch.php
+++ b/mod/videolist/views/default/videolist/watch.php

diff --cc mod/videolist/views/default/videolist/watch/bliptv.php
index 0000000000000000000000000000000000000000,ae3d75901e8ce5f1cd030eaef4183c646fa7818b..ae3d75901e8ce5f1cd030eaef4183c646fa7818b
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/videolist/watch/bliptv.php
+++ b/mod/videolist/views/default/videolist/watch/bliptv.php

diff --cc mod/videolist/views/default/videolist/watch/gisstv.php
index 0000000000000000000000000000000000000000,a96894adaa59bb5b40a9b0dcbdcdd979266b0fab..a96894adaa59bb5b40a9b0dcbdcdd979266b0fab
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/videolist/watch/gisstv.php
+++ b/mod/videolist/views/default/videolist/watch/gisstv.php

diff --cc mod/videolist/views/default/videolist/watch/metacafe.php
index 0000000000000000000000000000000000000000,ce8e257d5c3ac8e2f2fe9345021920ca729e6cdc..ce8e257d5c3ac8e2f2fe9345021920ca729e6cdc
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/videolist/watch/metacafe.php
+++ b/mod/videolist/views/default/videolist/watch/metacafe.php

diff --cc mod/videolist/views/default/videolist/watch/vimeo.php
index 0000000000000000000000000000000000000000,cdb4b6bfbc62cd3eaa2f33d2c960c254770d778d..cdb4b6bfbc62cd3eaa2f33d2c960c254770d778d
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/videolist/watch/vimeo.php
+++ b/mod/videolist/views/default/videolist/watch/vimeo.php

diff --cc mod/videolist/views/default/videolist/watch/youtube.php
index 0000000000000000000000000000000000000000,b0b758718dc5a77d5de6356923ab9b75d3520a85..b0b758718dc5a77d5de6356923ab9b75d3520a85
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/videolist/watch/youtube.php
+++ b/mod/videolist/views/default/videolist/watch/youtube.php

diff --cc mod/videolist/views/default/widgets/videolist/content.php
index 0000000000000000000000000000000000000000,aaf6076a3471f0a0d6296cc73d075756ddd1beac..aaf6076a3471f0a0d6296cc73d075756ddd1beac
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/widgets/videolist/content.php
+++ b/mod/videolist/views/default/widgets/videolist/content.php

diff --cc mod/videolist/views/default/widgets/videolist/edit.php
index 0000000000000000000000000000000000000000,a2865848edaef7e364226e20baca6b7cf31a9464..a2865848edaef7e364226e20baca6b7cf31a9464
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/widgets/videolist/edit.php
+++ b/mod/videolist/views/default/widgets/videolist/edit.php

diff --cc mod/videolist/views/rss/object/videolist_item.php
index 0000000000000000000000000000000000000000,41d89fadfa4d54e26d7adaf04d265c609e2dc3ab..41d89fadfa4d54e26d7adaf04d265c609e2dc3ab
mode 000000,100644..100644
--- /dev/null
--- 2/views/rss/object/videolist_item.php
+++ b/mod/videolist/views/rss/object/videolist_item.php