Merge pull request #136 from oerpub/video-plugin-new

first pass on media embed plugin (issue - #132)
oerpub · Mar 13, 2014 · ef75afc · ef75afc
2 parents 8988d56 + 1e86e6b
commit ef75afc
Show file tree

Hide file tree

Showing 15 changed files with 897 additions and 686 deletions.
diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
@@ -41,23 +41,9 @@ form#linkModal:focus {
     outline: none;
 }
 
-figure.aloha-oer-block {
-    display: block;
-    border: 0;
-    padding-top: 0; 
-    padding-bottom: 0;
-    margin: 0 32px 0 15px !important; /* !important in order to override ID-based selector from oerpub-content.less */
-}
-
-figure.aloha-oer-block > .title, 
-figure.aloha-oer-block > figcaption {
-    display: block;
-    text-align: center
-}
-
 figure.aloha-oer-block .image-wrapper {
     position: relative;
-    display: block;
+    display: inline-block;
     margin: 0 auto;
     overflow-x: auto;
 }

diff --git a/src/plugins/oer/assorted/lib/assorted-plugin.coffee b/src/plugins/oer/assorted/lib/assorted-plugin.coffee
@@ -1,7 +1,7 @@
 ###
 Register a couple of assorted oer plugins
 ###
-define [ 'aloha/plugin', 'jquery', 'overlay/overlay-plugin', './link', './image', './figure', './title-figcaption', './list' ], (Plugin, $, Popover, linkConfig, imageConfig, figureConfig, figcaptionConfig) ->
+define [ 'aloha/plugin', 'jquery', 'overlay/overlay-plugin', './link', './image'], (Plugin, $, Popover, linkConfig, imageConfig) ->
   Plugin.create 'assorted',
     defaultSettings:
         image:

diff --git a/src/plugins/oer/assorted/lib/assorted-plugin.js b/src/plugins/oer/assorted/lib/assorted-plugin.js
diff --git a/src/plugins/oer/assorted/lib/figure.coffee b/src/plugins/oer/assorted/lib/figure.coffee
diff --git a/src/plugins/oer/assorted/lib/figure.js b/src/plugins/oer/assorted/lib/figure.js