From b3a924552d7ab44f86f8c700e12c964eeefcfbc9 Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Thu, 1 Sep 2016 08:59:07 +0300 Subject: [PATCH 01/15] .gitignore added --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..df30947 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.idea/ From a95bfc95a98018f2afd2af86a9e3a9395d689818 Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Thu, 1 Sep 2016 09:10:24 +0300 Subject: [PATCH 02/15] WP-83_move_js_code_down --- view/library/send-to-editor.php | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/view/library/send-to-editor.php b/view/library/send-to-editor.php index be09926..a795310 100644 --- a/view/library/send-to-editor.php +++ b/view/library/send-to-editor.php @@ -155,23 +155,6 @@
- @@ -181,6 +164,21 @@ function kaltura_updateRatio() { From 73a21503dff409abc9bf7916f6218476a8c6d650 Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Thu, 1 Sep 2016 15:14:02 +0300 Subject: [PATCH 04/15] WP-83 fix spacing in preview page after upload --- view/library/send-to-editor.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/view/library/send-to-editor.php b/view/library/send-to-editor.php index bdcbe2f..61afebe 100644 --- a/view/library/send-to-editor.php +++ b/view/library/send-to-editor.php @@ -84,11 +84,12 @@ $flashVarsStr = KalturaHelpers::flashVarsToString( $this->flashVars ); $backUrl = esc_attr( KalturaHelpers::generateTabUrl( array( 'tab' => 'kaltura_browse' ) ) ); $backImageUrl = esc_attr( KalturaHelpers::getPluginUrl() ) . "/images/back.gif"; + $isFirstEdit = KalturaHelpers::getRequestParam( 'firstedit' ) == 'true'; ?> -
- +
+
Back
From 480611fb51faed7d7c716b37c5528c27728dfa76 Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Thu, 1 Sep 2016 16:51:55 +0300 Subject: [PATCH 05/15] version bump - 2.6.4 --- all-in-one-video-pack.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/all-in-one-video-pack.php b/all-in-one-video-pack.php index 04025d5..5083d2d 100644 --- a/all-in-one-video-pack.php +++ b/all-in-one-video-pack.php @@ -3,14 +3,14 @@ Plugin Name: All in One Video Pack Plugin URI: http://www.kaltura.org/ Description: This is not just another video embed tool - it includes every functionality you might need for video and rich-media, including playing and uploading. -Version: 2.6.3 +Version: 2.6.4 Author: Kaltura Author URI: http://www.kaltura.org/ */ define( 'KALTURA_PLUGIN_FILE', __FILE__ ); define( 'KALTURA_ROOT', dirname( __FILE__ ) ); -define( 'KALTURA_PLUGIN_VERSION', '2.6.3' ); +define( 'KALTURA_PLUGIN_VERSION', '2.6.4' ); require_once( KALTURA_ROOT . '/lib/Kaltura/Autoloader.php' ); From c13fbc16fa3734ecb9565998e8f34d82ee870a48 Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Sun, 4 Sep 2016 12:25:21 +0300 Subject: [PATCH 06/15] WP-95 fix responsive attribute value --- lib/Kaltura/LibraryController.php | 8 ++++---- view/library/send-to-editor.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Kaltura/LibraryController.php b/lib/Kaltura/LibraryController.php index 70de086..19126d3 100644 --- a/lib/Kaltura/LibraryController.php +++ b/lib/Kaltura/LibraryController.php @@ -138,16 +138,16 @@ public function sendtoeditorAction() { $uiConfId = KalturaHelpers::getRequestPostParam( 'uiConfId' ); $playerRatio = KalturaHelpers::getRequestPostParam( 'playerRatio' ); $hoveringControls = KalturaHelpers::getRequestPostParam( 'hoveringControls' ); - - $varMakeResponsive = KalturaHelpers::getRequestPostParam( 'makeResponsive' ); - $isResponsive = !empty($varMakeResponsive); + $isResponsive = ! empty( $width ) && $width === '100%'; $player = $kmodel->getPlayerUiConf( intval($uiConfId) ); $params['entryId'] = $entryId; $params['nextEntryIds'] = $entryIds; $params['playerWidth'] = $width; - $params['playerHeight'] = KalturaHelpers::calculatePlayerHeight( $player, $width, $playerRatio ); + if ( ! $isResponsive ) { + $params['playerHeight'] = KalturaHelpers::calculatePlayerHeight( $player, $width, $playerRatio ); + } $params['uiConfId'] = $uiConfId; $params['isResponsive'] = $isResponsive ? 'true': 'false'; $params['hoveringControls'] = $hoveringControls === 'true' ? 'true' : 'false'; diff --git a/view/library/send-to-editor.php b/view/library/send-to-editor.php index be09926..df98280 100644 --- a/view/library/send-to-editor.php +++ b/view/library/send-to-editor.php @@ -128,7 +128,7 @@ Select player size:
- +
From 147ad3e952ce031407537b37494f526e6683e05f Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Mon, 5 Sep 2016 10:11:10 +0300 Subject: [PATCH 07/15] WP-93 add less file based on the css file --- css/admin.less | 566 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 566 insertions(+) create mode 100644 css/admin.less diff --git a/css/admin.less b/css/admin.less new file mode 100644 index 0000000..512a9d9 --- /dev/null +++ b/css/admin.less @@ -0,0 +1,566 @@ +html { + height: 100%; +} +body { + height: 100%; +} +body.wait { + cursor: wait !important; + * { + cursor: wait !important; + } +} +.kaltura-loader { + background-image: url(../images/small_loader.gif); + display: none; + height: 16px; + width: 16px; +} +form.kaltura-form { + height: 100%; + margin: 0; +} +.kaltura-edit-entry-form { + padding: 0 16px; + #entry-title { + max-width: 400px; + } + #entry-description { + max-width: 400px; + } +} +.media_page_interactive_video_library { + .column-posts { + width: 5em; + } +} +.kaltura-pager { + float: right; + margin-right: 6%; + text-align: center; +} +.kaltura-tab { + margin: 15px; + #filter-categories { + height: 240px; + width: 36%; + } + #kaltura-browse { + width: 56%; + } + .filter-category-input { + height: 16px; + width: 16px; + &:checked { + height: 16px; + width: 16px; + } + } + #filter-categories-header { + width: 45%; + } + #filter-categories-button { + right: 9%; + } + .entry-search-filter { + width: 34%; + } + .entry-search-filter>input[name="search"] { + width: 130px; + } + input { + font-size: 12px; + } + .filter-category-div-wrapper { + margin-bottom: 4px; + } +} +.kaltura-updated { + font-weight: bold; + padding: 0.6em 1.6em; +} +a.kalturaLink { + color: #006699; + font-size: 14px; + font-weight: bold; + text-decoration: underline; + &:hover { + color: #6699CC; + } +} +div.kaltura-wrap { + max-width: 1200px; + padding-top: 10px; +} +ul#kaltura-browse { + float: right; + list-style: none; + padding: 0 0 0 5px; + width: 72%; + li { + background: url("../images/entries_bg.png") center 0 no-repeat; + float: left; + margin: 0 10px 15px 10px; + padding: 10px 0 5px 0; + position: relative; + text-align: center; + width: 180px; + .status { + background-color: #e5f1fb; + color: #333333; + display: none; + height: 25px; + left: 0; + line-height: 25px; + margin: 0 40px; + position: absolute; + top: 97px; + width: 100px; + z-index: 5; + } + .thumb { + border: none; + height: 100px; + .overlay { + background-image: url(../images/status_bg.png); + display: none; + height: 90px; + left: 0; + margin: 0 30px; + position: absolute; + top: 40px; + width: 120px; + z-index: 2; + } + } + .entryTitle.showName { + cursor: pointer; + font-weight: bold; + } + .entryTitle { + color: #31302E; + font-size: 11px; + height: 30px; + line-height: 15px; + margin: 0 5px 0 5px; + overflow: hidden; + } + .submit { + border: none; + padding: 5px 10px 0; + text-align: center; + input { + border: none; + height: 22px; + margin: 0 5px; + padding: 0; + width: 23px; + } + input.checkbox { + height: 10px; + width: 10px; + } + input.delete { + background: url("../images/delete_icon.gif") 0 0 no-repeat; + cursor: pointer; + } + input.add { + background: url("../images/add_icon.gif") 0 0 no-repeat; + cursor: pointer; + } + input.thumb { + background: url("../images/capture_icon.gif") 0 0 no-repeat; + cursor: pointer; + } + a { + color: #004265; + } + } + input.sendButton { + width: 9em; + } + } + li.statusConverting { + .overlay { + display: block; + } + div.convertingMsg { + display: block; + } + } + li.statusError { + .overlay { + display: block; + } + div.errorMsg { + display: block; + } + } +} +#update-thumbnail-page { + height: 100%; + overflow: hidden; + .page-wrapper { + background-color: #EAF3FA; + border: solid 1px #B0D1E0; + margin: 10px; + } + .player-wrapper { + margin-top: 20px; + min-height: 330px; + #kplayer { + height: 330px; + margin: 0 auto; + width: 400px; + } + } + p { + padding: 0 30px; + text-align: center; + } +} +#send-to-editor { + border: solid 1px #AED3E3; + .videoTitle { + padding-left: 30px; + } + .form-table { + height: 100%; + width: 100%; + td { + border: 0; + table { + width: 100%; + } + } + .options-td { + padding-left: 30px; + vertical-align: top; + width: 50%; + } + } + .kaltura-loader { + margin: 50px auto; + } + .playerName { + color: #000000; + font-size: 12px; + font-weight: normal; + margin: 5px 0 0 5px; + overflow: hidden; + position: absolute; + width: 200px; + } + table.options { + td { + padding: 0; + } + td.options-aspect-ratio { + vertical-align: top; + width: 40%; + } + td.options-aspect-ratio>strong { + display: inline-block; + margin-bottom: 10px; + } + td.options-size>strong { + display: inline-block; + margin-bottom: 10px; + } + } + .backDiv { + padding: 5px; + text-align: right; + } + td.kaltura-preview-player-wrapper { + float: left; + height: 100%; + margin: 0; + padding: 0; + width: 50%; + } + .player-selector-tr { + div.selectBox { + padding-bottom: 15px; + #uiConfId { + height: 25px; + margin-left: 10px; + width: 250px; + } + } + } + .submit { + border: 0; + margin: 0 10px 10px 10px; + padding: 0; + text-align: right; + } + .player-aspect-ratio { + margin-top: 75%; + } + .kaltura-responsive-player-wrapper { + display: inline-block; + position: relative; + width: 100%; + } + #divKalturaPlayer { + bottom: 0; + height: 100%; + left: 0; + position: absolute; + right: 0; + top: 0; + } + p.note { + font-size: 10px; + margin: 5px 0 0 10px; + width: 400px; + } + label { + font-weight: bold; + } + fieldset { + padding: 5px 5px 10px 5px; + legend { + padding-bottom: 0px; + } + } + div.selectBox { + margin-bottom: 15px; + } + .playerRatioDiv { + margin-bottom: 10px; + } + div.radioBox { + padding: 4px 0 12px 0; + .iradio { + position: relative; + top: 3px; + } + label { + padding-left: 7px; + } + } + div.checkBox { + padding: 4px 0 12px 0; + } + input#playerCustomWidth { + height: 25px; + } + select { + height: auto; + padding: 0; + width: 130px; + } +} +#kaltura-cms-login { + background-color: #E1EAEF; + border: solid 1px #B4D5E5; + margin: 5px 0 15px 0; + .kalturaFirstRow { + td { + padding-top: 10px; + } + th { + padding-top: 10px; + } + } + th { + font-weight: normal; + padding-left: 10px; + } + .kalturaLastRow { + td { + padding-bottom: 10px; + padding-right: 10px; + } + } +} +.kaltura-wrap { + #kaltura-cms-login { + float: right; + margin-right: 6%; + } +} +.entries { + p.info { + float: left; + margin: 0 0 12px; + } +} +.settings_page_kaltura_options { + .registration { + .form-table { + th { + width: 250px; + } + } + input[type="text"] { + width: 300px; + } + select { + width: 300px; + } + textarea { + width: 300px; + } + .error { + background-color: #FFEBE8; + border: solid 1px #CC0000; + } + label.error { + border: none; + } + tr.agree_to_terms { + label.error { + background: transparent; + color: #CC0000; + display: block; + } + } + } + select { + width: 420px; + } + tr.advanced { + display: none; + } + .user_identifier_desc { + padding-left: 23px; + width: 400px; + } + tr.user_identifier { + label { + font-weight: bold; + } + } + .available-players { + .players-scroll { + max-height: 120px; + overflow-y: auto; + width: 420px; + label { + display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + } +} + +#all-in-one-video-pack-widget { + #kaltura-loader { + display: none; + height: 35px; + margin: auto; + padding: 20px 0; + width: 35px; + } + #kaltura-sidebar-menu { + margin: 0; + padding: 10px 0; + text-align: center; + width: 100%; + a { + cursor: pointer; + white-space: nowrap; + } + a.selected { + font-weight: bold; + &:hover { + cursor: default; + text-decoration: none; + } + } + } + ul#kaltura-items { + margin: 0; + li { + background: none; + margin-bottom: 10px; + margin: 0; + text-align: center; + &:before { + content: ""; + } + div.thumb { + background-color: #000000; + height: 90px; + margin: 0 auto; + width: 120px; + } + } + } + ul.kaltura-sidebar-pager { + margin: 0 0 30px 0; + padding: 0; + width: 100%; + li { + background: none; + float: left; + margin: 0; + padding: 0; + text-align: center; + width: 50%; + &:before { + content: ""; + } + } + a { + cursor: pointer; + } + } +} +#kaltura-wrap { + #root_category { + width: 450px; + } +} +.filter-side { + float: left; + width: 25%; +} +.filter-category-label { + position: relative; + top: -6px; +} +.filter-category-input { + &:checked { + -moz-box-shadow: 0 0 12px #CCCC00; + -webkit-box-shadow: 0 0 12px #CCCC00; + box-shadow: 0 0 12px #CCCC00; + } +} +.entry-search-filter { + float: right; + margin-right: 6%; +} +.kaltura-caret { + cursor: pointer; + float: left; + font-size: 10px; + left: -2px; + margin-right: 3px; + position: relative; + top: -4px; +} +#filter-media-owner-type-wrap { + margin-bottom: 15px; + label { + display: block; + } +} +#filter-categories { + border: 1px solid #d5d2ca; + height: 100%; + margin-right: 20px; + max-height: 500px; + overflow: auto; + padding: 15px; +} +#filter-categories-button { + display: block; + margin: 0 auto; + width: 80px; +} \ No newline at end of file From e6e68479b07b1ebc6b13a7f4597fc8f09314c817 Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Mon, 5 Sep 2016 10:11:36 +0300 Subject: [PATCH 08/15] WP-93 compile less to css --- css/admin.css | 799 +++++++++++++++++++++----------------------------- 1 file changed, 337 insertions(+), 462 deletions(-) diff --git a/css/admin.css b/css/admin.css index 4ea8413..3c6bb39 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1,654 +1,529 @@ -html, body { - height: 100%; +html { + height: 100%; } - -body.wait, body.wait * { - cursor: wait !important; +body { + height: 100%; +} +body.wait { + cursor: wait !important; +} +body.wait * { + cursor: wait !important; } - .kaltura-loader { - display: none; - width: 16px; - height: 16px; - background-image: url(../images/small_loader.gif); + background-image: url(../images/small_loader.gif); + display: none; + height: 16px; + width: 16px; } - form.kaltura-form { - height: 100%; - margin: 0; + height: 100%; + margin: 0; } - .kaltura-edit-entry-form { - padding: 0 16px; + padding: 0 16px; } .kaltura-edit-entry-form #entry-title { - max-width: 400px; + max-width: 400px; } - .kaltura-edit-entry-form #entry-description { - max-width: 400px; + max-width: 400px; } - .media_page_interactive_video_library .column-posts { - width: 5em; + width: 5em; } - .kaltura-pager { - text-align: center; - float: right; - margin-right: 6%; + float: right; + margin-right: 6%; + text-align: center; } - -/* general for tabs */ .kaltura-tab { - margin: 15px; + margin: 15px; +} +.kaltura-tab #filter-categories { + height: 240px; + width: 36%; +} +.kaltura-tab #kaltura-browse { + width: 56%; +} +.kaltura-tab .filter-category-input { + height: 16px; + width: 16px; +} +.kaltura-tab .filter-category-input:checked { + height: 16px; + width: 16px; +} +.kaltura-tab #filter-categories-header { + width: 45%; +} +.kaltura-tab #filter-categories-button { + right: 9%; +} +.kaltura-tab .entry-search-filter { + width: 34%; +} +.kaltura-tab .entry-search-filter > input[name="search"] { + width: 130px; +} +.kaltura-tab input { + font-size: 12px; +} +.kaltura-tab .filter-category-div-wrapper { + margin-bottom: 4px; } - .kaltura-updated { - padding: 0.6em 1.6em; - font-weight: bold; + font-weight: bold; + padding: 0.6em 1.6em; } - a.kalturaLink { - color: #006699; - font-size: 14px; - font-weight: bold; - text-decoration: underline; + color: #006699; + font-size: 14px; + font-weight: bold; + text-decoration: underline; } - a.kalturaLink:hover { - color: #6699CC; + color: #6699CC; } - -/* browse tab */ div.kaltura-wrap { - max-width: 1200px; - padding-top: 10px; + max-width: 1200px; + padding-top: 10px; } - ul#kaltura-browse { - width: 72%; - list-style: none; - padding: 0 0 0 5px; - float: right; + float: right; + list-style: none; + padding: 0 0 0 5px; + width: 72%; } - ul#kaltura-browse li { - float: left; - position: relative; - width: 180px; - margin: 0 10px 15px 10px; - padding: 10px 0 5px 0; - text-align: center; - background: url("../images/entries_bg.png") center 0 no-repeat; -} - + background: url("../images/entries_bg.png") center 0 no-repeat; + float: left; + margin: 0 10px 15px 10px; + padding: 10px 0 5px 0; + position: relative; + text-align: center; + width: 180px; +} ul#kaltura-browse li .status { - display: none; - position: absolute; - top: 97px; - left: 0; - height: 25px; - width: 100px; - margin: 0 40px; - line-height: 25px; - color: #333; - background-color: #e5f1fb; - z-index: 5; -} - + background-color: #e5f1fb; + color: #333333; + display: none; + height: 25px; + left: 0; + line-height: 25px; + margin: 0 40px; + position: absolute; + top: 97px; + width: 100px; + z-index: 5; +} ul#kaltura-browse li .thumb { - height: 100px; - border: none; + border: none; + height: 100px; } - ul#kaltura-browse li .thumb .overlay { - display: none; - position: absolute; - top: 40px; - left: 0; - width: 120px; - height: 90px; - margin: 0 30px; - background-image: url(../images/status_bg.png); - z-index: 2; -} - -ul#kaltura-browse li.statusConverting .overlay, -ul#kaltura-browse li.statusError .overlay { - display: block; + background-image: url(../images/status_bg.png); + display: none; + height: 90px; + left: 0; + margin: 0 30px; + position: absolute; + top: 40px; + width: 120px; + z-index: 2; } - -ul#kaltura-browse li.statusConverting div.convertingMsg { - display: block; -} - -ul#kaltura-browse li.statusError div.errorMsg { - display: block; -} - ul#kaltura-browse li .entryTitle.showName { - cursor: pointer; - font-weight: bold; + cursor: pointer; + font-weight: bold; } - ul#kaltura-browse li .entryTitle { - color: #31302E; - line-height: 15px; - height: 30px; - font-size: 11px; - overflow: hidden; - margin: 0 5px 0 5px; -} - + color: #31302E; + font-size: 11px; + height: 30px; + line-height: 15px; + margin: 0 5px 0 5px; + overflow: hidden; +} ul#kaltura-browse li .submit { - text-align: center; - padding: 5px 10px 0; - border: none; + border: none; + padding: 5px 10px 0; + text-align: center; } - ul#kaltura-browse li .submit input { - width: 23px; - height: 22px; - margin: 0 5px; - border: none; - padding: 0; + border: none; + height: 22px; + margin: 0 5px; + padding: 0; + width: 23px; } - ul#kaltura-browse li .submit input.checkbox { - width: 10px; - height: 10px; + height: 10px; + width: 10px; } - ul#kaltura-browse li .submit input.delete { - background: url("../images/delete_icon.gif") 0 0 no-repeat; - cursor: pointer; + background: url("../images/delete_icon.gif") 0 0 no-repeat; + cursor: pointer; } - ul#kaltura-browse li .submit input.add { - background: url("../images/add_icon.gif") 0 0 no-repeat; - cursor: pointer; + background: url("../images/add_icon.gif") 0 0 no-repeat; + cursor: pointer; } - ul#kaltura-browse li .submit input.thumb { - background: url("../images/capture_icon.gif") 0 0 no-repeat; - cursor: pointer; + background: url("../images/capture_icon.gif") 0 0 no-repeat; + cursor: pointer; } - ul#kaltura-browse li .submit a { - color: #004265; + color: #004265; } - ul#kaltura-browse li input.sendButton { - width: 9em; + width: 9em; +} +ul#kaltura-browse li.statusConverting .overlay { + display: block; +} +ul#kaltura-browse li.statusConverting div.convertingMsg { + display: block; +} +ul#kaltura-browse li.statusError .overlay { + display: block; +} +ul#kaltura-browse li.statusError div.errorMsg { + display: block; } - -/* update thumbnail page */ #update-thumbnail-page { - overflow: hidden; - height: 100%; + height: 100%; + overflow: hidden; } - #update-thumbnail-page .page-wrapper { - background-color: #EAF3FA; - border: solid 1px #B0D1E0; - margin: 10px; + background-color: #EAF3FA; + border: solid 1px #B0D1E0; + margin: 10px; } - #update-thumbnail-page .player-wrapper { - min-height: 330px; - margin-top: 20px; + margin-top: 20px; + min-height: 330px; } - #update-thumbnail-page .player-wrapper #kplayer { - width: 400px; - height: 330px; - margin: 0 auto; + height: 330px; + margin: 0 auto; + width: 400px; } - #update-thumbnail-page p { - text-align: center; - padding: 0 30px; + padding: 0 30px; + text-align: center; +} +#send-to-editor { + border: solid 1px #AED3E3; } - -/* edit & send tabs */ #send-to-editor .videoTitle { - padding-left: 30px; + padding-left: 30px; } - #send-to-editor .form-table { - width: 100%; - height: 100%; + height: 100%; + width: 100%; } - -#send-to-editor { - border: solid 1px #AED3E3; +#send-to-editor .form-table td { + border: 0; +} +#send-to-editor .form-table td table { + width: 100%; +} +#send-to-editor .form-table .options-td { + padding-left: 30px; + vertical-align: top; + width: 50%; } - #send-to-editor .kaltura-loader { - margin: 50px auto; + margin: 50px auto; } - #send-to-editor .playerName { - position: absolute; - margin: 5px 0 0 5px; - font-size: 12px; - width: 200px; - font-weight: normal; - color: #000; - overflow: hidden; -} - + color: #000000; + font-size: 12px; + font-weight: normal; + margin: 5px 0 0 5px; + overflow: hidden; + position: absolute; + width: 200px; +} #send-to-editor table.options td { - padding: 0; + padding: 0; } - #send-to-editor table.options td.options-aspect-ratio { - vertical-align: top; - width: 40%; + vertical-align: top; + width: 40%; } - -#send-to-editor table.options td.options-aspect-ratio > strong, #send-to-editor table.options td.options-size > strong { - display: inline-block; - margin-bottom: 10px; +#send-to-editor table.options td.options-aspect-ratio > strong { + display: inline-block; + margin-bottom: 10px; } - -#send-to-editor .backDiv { - text-align: right; - padding: 5px; +#send-to-editor table.options td.options-size > strong { + display: inline-block; + margin-bottom: 10px; } - -#send-to-editor .form-table td { - border: 0; +#send-to-editor .backDiv { + padding: 5px; + text-align: right; } - #send-to-editor td.kaltura-preview-player-wrapper { - width: 50%; - float: left; - height: 100%; - margin: 0; - padding: 0; -} - -#send-to-editor .form-table td table { - width: 100%; -} - -#send-to-editor .form-table .options-td { - padding-left: 30px; - width: 50%; - vertical-align: top; + float: left; + height: 100%; + margin: 0; + padding: 0; + width: 50%; } - #send-to-editor .player-selector-tr div.selectBox { - padding-bottom: 15px; + padding-bottom: 15px; } - #send-to-editor .player-selector-tr div.selectBox #uiConfId { - margin-left: 10px; - width: 250px; - height: 25px; + height: 25px; + margin-left: 10px; + width: 250px; } - #send-to-editor .submit { - margin: 0 10px 10px 10px; - padding: 0; - text-align: right; - border: 0; + border: 0; + margin: 0 10px 10px 10px; + padding: 0; + text-align: right; } - #send-to-editor .player-aspect-ratio { - margin-top: 75%; + margin-top: 75%; } - #send-to-editor .kaltura-responsive-player-wrapper { - width: 100%; - display: inline-block; - position: relative; + display: inline-block; + position: relative; + width: 100%; } - #send-to-editor #divKalturaPlayer { - /*text-align: center;*/ - position: absolute; - top: 0; - bottom: 0; - right: 0; - left: 0; - height: 100%; -} - + bottom: 0; + height: 100%; + left: 0; + position: absolute; + right: 0; + top: 0; +} #send-to-editor p.note { - margin: 5px 0 0 10px; - width: 400px; - font-size: 10px; + font-size: 10px; + margin: 5px 0 0 10px; + width: 400px; } - #send-to-editor label { - font-weight: bold; + font-weight: bold; } - #send-to-editor fieldset { - padding: 5px 5px 10px 5px; + padding: 5px 5px 10px 5px; } - #send-to-editor fieldset legend { - padding-bottom: 0px; + padding-bottom: 0px; } - #send-to-editor div.selectBox { - margin-bottom: 15px; + margin-bottom: 15px; } - #send-to-editor .playerRatioDiv { - margin-bottom: 10px; + margin-bottom: 10px; } - -#send-to-editor div.radioBox, #send-to-editor div.checkBox { - padding: 4px 0 12px 0; +#send-to-editor div.radioBox { + padding: 4px 0 12px 0; } - #send-to-editor div.radioBox .iradio { - position: relative; - top: 3px; + position: relative; + top: 3px; } - #send-to-editor div.radioBox label { - padding-left: 7px; + padding-left: 7px; +} +#send-to-editor div.checkBox { + padding: 4px 0 12px 0; } - #send-to-editor input#playerCustomWidth { - height: 25px; + height: 25px; } - #send-to-editor select { - width: 130px; - height: auto; - padding: 0; + height: auto; + padding: 0; + width: 130px; } - -/* cms login box */ #kaltura-cms-login { - background-color: #E1EAEF; - border: solid 1px #B4D5E5; - margin: 5px 0 15px 0; + background-color: #E1EAEF; + border: solid 1px #B4D5E5; + margin: 5px 0 15px 0; } - #kaltura-cms-login .kalturaFirstRow td { - padding-top: 10px; + padding-top: 10px; } - #kaltura-cms-login .kalturaFirstRow th { - padding-top: 10px; + padding-top: 10px; } - #kaltura-cms-login th { - font-weight: normal; - padding-left: 10px; + font-weight: normal; + padding-left: 10px; } - #kaltura-cms-login .kalturaLastRow td { - padding-right: 10px; - padding-bottom: 10px; + padding-bottom: 10px; + padding-right: 10px; } - .kaltura-wrap #kaltura-cms-login { - float: right; - margin-right: 6%; + float: right; + margin-right: 6%; } - -/* entries page */ .entries p.info { - margin: 0 0 12px; - float: left; + float: left; + margin: 0 0 12px; } - -/* registration page */ .settings_page_kaltura_options .registration .form-table th { - width: 250px + width: 250px; } - .settings_page_kaltura_options .registration input[type="text"] { - width: 300px; + width: 300px; } - .settings_page_kaltura_options .registration select { - width: 300px; + width: 300px; } - .settings_page_kaltura_options .registration textarea { - width: 300px; + width: 300px; } - .settings_page_kaltura_options .registration .error { - border: solid 1px #CC0000; - background-color: #FFEBE8; + background-color: #FFEBE8; + border: solid 1px #CC0000; } - .settings_page_kaltura_options .registration label.error { - border: none; + border: none; } - .settings_page_kaltura_options .registration tr.agree_to_terms label.error { - background: transparent; - color: #CC0000; - display: block; + background: transparent; + color: #CC0000; + display: block; } - -/* settings info page */ .settings_page_kaltura_options select { - width: 420px; + width: 420px; } - .settings_page_kaltura_options tr.advanced { - display: none; + display: none; } - .settings_page_kaltura_options .user_identifier_desc { - width: 400px; - padding-left: 23px; + padding-left: 23px; + width: 400px; } - .settings_page_kaltura_options tr.user_identifier label { - font-weight: bold; + font-weight: bold; } - .settings_page_kaltura_options .available-players .players-scroll { - max-height: 120px; - width: 420px; - overflow-y: auto; + max-height: 120px; + overflow-y: auto; + width: 420px; } - .settings_page_kaltura_options .available-players .players-scroll label { - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - display: block; -} - -/*-------------------------------- - Contribution Wizard Modal Window ----------------------------------*/ -* html .modalContributionWizard { - top: expression((document.documentElement.scrollTop || document.body.scrollTop) + Math.round(0) + 200 + 'px'); -} - -/*-------------------------------- - Sidebar Widget ----------------------------------*/ - + display: block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} #all-in-one-video-pack-widget #kaltura-loader { - display: none; - width: 35px; - height: 35px; - padding: 20px 0; - margin: auto; + display: none; + height: 35px; + margin: auto; + padding: 20px 0; + width: 35px; } - #all-in-one-video-pack-widget #kaltura-sidebar-menu { - width: 100%; - margin: 0; - padding: 10px 0; - text-align: center; + margin: 0; + padding: 10px 0; + text-align: center; + width: 100%; } - #all-in-one-video-pack-widget #kaltura-sidebar-menu a { - cursor: pointer; - white-space: nowrap; + cursor: pointer; + white-space: nowrap; } - #all-in-one-video-pack-widget #kaltura-sidebar-menu a.selected { - font-weight: bold; + font-weight: bold; } - #all-in-one-video-pack-widget #kaltura-sidebar-menu a.selected:hover { - text-decoration: none; - cursor: default; + cursor: default; + text-decoration: none; } - #all-in-one-video-pack-widget ul#kaltura-items { - margin: 0; + margin: 0; } - #all-in-one-video-pack-widget ul#kaltura-items li { - background: none; - text-align: center; - margin: 0; - margin-bottom: 10px; + background: none; + margin-bottom: 10px; + margin: 0; + text-align: center; } - #all-in-one-video-pack-widget ul#kaltura-items li:before { - content: ""; + content: ""; } - #all-in-one-video-pack-widget ul#kaltura-items li div.thumb { - width: 120px; - height: 90px; - margin: 0 auto; - background-color: #000000; + background-color: #000000; + height: 90px; + margin: 0 auto; + width: 120px; } - #all-in-one-video-pack-widget ul.kaltura-sidebar-pager { - width: 100%; - margin: 0 0 30px 0; - padding: 0; + margin: 0 0 30px 0; + padding: 0; + width: 100%; } - #all-in-one-video-pack-widget ul.kaltura-sidebar-pager li { - float: left; - width: 50%; - text-align: center; - margin: 0; - padding: 0; - background: none; -} - + background: none; + float: left; + margin: 0; + padding: 0; + text-align: center; + width: 50%; +} #all-in-one-video-pack-widget ul.kaltura-sidebar-pager li:before { - content: ""; + content: ""; } - #all-in-one-video-pack-widget ul.kaltura-sidebar-pager a { - cursor: pointer; + cursor: pointer; } - -#kaltura-wrap -#root_category { - width: 450px; +#kaltura-wrap #root_category { + width: 450px; } - .filter-side { - width: 25%; - float: left; + float: left; + width: 25%; } - .filter-category-label { - top: -6px; - position: relative; + position: relative; + top: -6px; } - .filter-category-input:checked { - -webkit-box-shadow: 0 0 12px #CCCC00; - -moz-box-shadow: 0 0 12px #CCCC00; - box-shadow: 0 0 12px #CCCC00; + -moz-box-shadow: 0 0 12px #CCCC00; + -webkit-box-shadow: 0 0 12px #CCCC00; + box-shadow: 0 0 12px #CCCC00; } - .entry-search-filter { - float: right; - margin-right: 6%; + float: right; + margin-right: 6%; } - .kaltura-caret { - float: left; - position: relative; - cursor: pointer; - top: -4px; - left: -2px; - font-size: 10px; - margin-right: 3px; -} - -#filter-media-owner-type-wrap label { - display: block; + cursor: pointer; + float: left; + font-size: 10px; + left: -2px; + margin-right: 3px; + position: relative; + top: -4px; } - #filter-media-owner-type-wrap { - margin-bottom: 15px; -} - -#filter-categories { - padding: 15px; - margin-right: 20px; - height: 100%; - max-height: 500px; - overflow: auto; - border: 1px solid #d5d2ca; -} - -#filter-categories-button { - width: 80px; - margin: 0 auto; - display: block; -} - -/** CSS for iframe when uploading media to post. */ -.kaltura-tab #filter-categories { - height: 240px; - width: 36%; -} - -.kaltura-tab #kaltura-browse { - width: 56%; -} - -.kaltura-tab .filter-category-input { - width: 16px; - height: 16px; -} - -.kaltura-tab .filter-category-input:checked { - width: 16px; - height: 16px; -} - -.kaltura-tab #filter-categories-header { - width: 45%; -} - -.kaltura-tab #filter-categories-button { - right: 9%; + margin-bottom: 15px; } - -.kaltura-tab .entry-search-filter { - width: 34%; +#filter-media-owner-type-wrap label { + display: block; } - -.kaltura-tab .entry-search-filter > input[name="search"] { - width: 130px; +#filter-categories { + border: 1px solid #d5d2ca; + height: 100%; + margin-right: 20px; + max-height: 500px; + overflow: auto; + padding: 15px; } - -.kaltura-tab input { - font-size: 12px; +#filter-categories-button { + display: block; + margin: 0 auto; + width: 80px; } - -.kaltura-tab .filter-category-div-wrapper { - margin-bottom: 4px; -} \ No newline at end of file From e5417ba0b537c41a1caa5afa1cbefff49b3dcfa6 Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Mon, 5 Sep 2016 10:17:10 +0300 Subject: [PATCH 09/15] WP-93 fix scrolling issues on mobile --- css/admin.css | 6 +++--- css/admin.less | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/css/admin.css b/css/admin.css index 3c6bb39..d944d29 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1,8 +1,7 @@ -html { - height: 100%; -} +html, body { height: 100%; + overflow: auto; } body.wait { cursor: wait !important; @@ -95,6 +94,7 @@ ul#kaltura-browse { list-style: none; padding: 0 0 0 5px; width: 72%; + overflow: auto; } ul#kaltura-browse li { background: url("../images/entries_bg.png") center 0 no-repeat; diff --git a/css/admin.less b/css/admin.less index 512a9d9..89bc7b7 100644 --- a/css/admin.less +++ b/css/admin.less @@ -1,9 +1,8 @@ -html { - height: 100%; -} -body { +html, body { height: 100%; + overflow: auto; } + body.wait { cursor: wait !important; * { @@ -97,6 +96,7 @@ ul#kaltura-browse { list-style: none; padding: 0 0 0 5px; width: 72%; + overflow: auto; li { background: url("../images/entries_bg.png") center 0 no-repeat; float: left; From 9c9234117606622ecd2aec4632e9a46cc7d6640d Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Mon, 5 Sep 2016 10:17:35 +0300 Subject: [PATCH 10/15] WP-93 fix css warning --- css/admin.css | 2 +- css/admin.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/admin.css b/css/admin.css index d944d29..66e39ae 100644 --- a/css/admin.css +++ b/css/admin.css @@ -314,7 +314,7 @@ ul#kaltura-browse li.statusError div.errorMsg { padding: 5px 5px 10px 5px; } #send-to-editor fieldset legend { - padding-bottom: 0px; + padding-bottom: 0; } #send-to-editor div.selectBox { margin-bottom: 15px; diff --git a/css/admin.less b/css/admin.less index 89bc7b7..c4cf42b 100644 --- a/css/admin.less +++ b/css/admin.less @@ -322,7 +322,7 @@ ul#kaltura-browse { fieldset { padding: 5px 5px 10px 5px; legend { - padding-bottom: 0px; + padding-bottom: 0; } } div.selectBox { From 0adaaad8eeabde834879e139cce560f6bd9c2945 Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Mon, 5 Sep 2016 10:19:52 +0300 Subject: [PATCH 11/15] WP-93 move the 'owner' filtering next to the search bar --- css/admin.css | 7 ++-- css/admin.less | 9 +++-- view/library/browse.php | 87 +++++++++++++++++++++-------------------- 3 files changed, 55 insertions(+), 48 deletions(-) diff --git a/css/admin.css b/css/admin.css index 66e39ae..3cba183 100644 --- a/css/admin.css +++ b/css/admin.css @@ -499,6 +499,9 @@ ul#kaltura-browse li.statusError div.errorMsg { float: right; margin-right: 6%; } +.kaltura-filter-bar { + overflow: hidden; +} .kaltura-caret { cursor: pointer; float: left; @@ -509,11 +512,9 @@ ul#kaltura-browse li.statusError div.errorMsg { top: -4px; } #filter-media-owner-type-wrap { + float: left; margin-bottom: 15px; } -#filter-media-owner-type-wrap label { - display: block; -} #filter-categories { border: 1px solid #d5d2ca; height: 100%; diff --git a/css/admin.less b/css/admin.less index c4cf42b..dc46aed 100644 --- a/css/admin.less +++ b/css/admin.less @@ -536,6 +536,11 @@ ul#kaltura-browse { float: right; margin-right: 6%; } + +.kaltura-filter-bar { + overflow: hidden; +} + .kaltura-caret { cursor: pointer; float: left; @@ -546,10 +551,8 @@ ul#kaltura-browse { top: -4px; } #filter-media-owner-type-wrap { + float: left; margin-bottom: 15px; - label { - display: block; - } } #filter-categories { border: 1px solid #d5d2ca; diff --git a/view/library/browse.php b/view/library/browse.php index 2895007..5b59663 100644 --- a/view/library/browse.php +++ b/view/library/browse.php @@ -44,7 +44,6 @@
- renderView( 'filter-media-owner.php' ); ?>
@@ -65,48 +64,52 @@ -
- - -
- - +

From 2987073ef880e60ca10d48ef007b6392827b6fae Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Mon, 5 Sep 2016 14:46:58 +0300 Subject: [PATCH 12/15] WP-95 no need to check if is empty --- lib/Kaltura/LibraryController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kaltura/LibraryController.php b/lib/Kaltura/LibraryController.php index 19126d3..b0e68a4 100644 --- a/lib/Kaltura/LibraryController.php +++ b/lib/Kaltura/LibraryController.php @@ -138,7 +138,7 @@ public function sendtoeditorAction() { $uiConfId = KalturaHelpers::getRequestPostParam( 'uiConfId' ); $playerRatio = KalturaHelpers::getRequestPostParam( 'playerRatio' ); $hoveringControls = KalturaHelpers::getRequestPostParam( 'hoveringControls' ); - $isResponsive = ! empty( $width ) && $width === '100%'; + $isResponsive = $width === '100%'; $player = $kmodel->getPlayerUiConf( intval($uiConfId) ); From a6e32db44956cdec0d9b75da4daf5b04442b86ef Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Mon, 5 Sep 2016 15:09:19 +0300 Subject: [PATCH 13/15] WP-83 use wp_json_encode --- view/library/send-to-editor.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/view/library/send-to-editor.php b/view/library/send-to-editor.php index 61afebe..0f52776 100644 --- a/view/library/send-to-editor.php +++ b/view/library/send-to-editor.php @@ -205,18 +205,18 @@ function kaltura_updateRatio() { return true; }); - jQuery.kalturaPlayerSelector({ - url : ajaxurl + '?action=kaltura_ajax&kaction=getplayers', - defaultId : , - html5Url : , - previewId : 'divKalturaPlayer', - entryId : entry->id); ?>, - playersList: '#uiConfId', - dimensions : 'input[name=playerRatio]', - submit : 'input[name=sendToEditorButton]', - entryError: 'entryError; ?>', - entryConverting: 'entryConverting; ?>' - }); - }); + jQuery.kalturaPlayerSelector( { + url : ajaxurl + '?action=kaltura_ajax&kaction=getplayers', + defaultId : , + html5Url : , + previewId : 'divKalturaPlayer', + entryId : entry->id ); ?>, + playersList : '#uiConfId', + dimensions : 'input[name=playerRatio]', + submit : 'input[name=sendToEditorButton]', + entryError : entryError ); ?>, + entryConverting: entryConverting ); ?> + } ); + } ); Date: Mon, 5 Sep 2016 15:10:22 +0300 Subject: [PATCH 14/15] WP-83 fixed a bug where if the root category is 0 (i.e. no category) file upload failed --- view/library/upload.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/view/library/upload.php b/view/library/upload.php index 1d61248..f9e8d2f 100644 --- a/view/library/upload.php +++ b/view/library/upload.php @@ -22,13 +22,7 @@ function createEntry(name, uploadTokenId) { jQuery.ajax({ url: params.apiURL + '?service=baseEntry&action=add&format=9', - data: { - 'entry:objectType': 'KalturaBaseEntry', - 'entry:name': name, - 'entry:categoriesIds': rootCategory, - 'type': -1, // KalturaEntryType::AUTOMATIC - 'ks': params.ks - }, + data: _createEntryCreatePayload(name, params.ks, rootCategory), type: "GET", dataType: "jsonp" }) @@ -41,6 +35,21 @@ function createEntry(name, uploadTokenId) { .fail(onGenericError); } + function _createEntryCreatePayload(name, ks, rootCategory) { + var data = { + 'entry:objectType': 'KalturaBaseEntry', + 'entry:name': name, + 'type': -1, // KalturaEntryType::AUTOMATIC + 'ks': ks + }; + + if(rootCategory != 0) { + data.rootCategory = rootCategory; + } + + return data; + } + function attachUploadToken(entryId, uploadTokenId) { setMessage('Attaching uploaded file...'); jQuery.ajax({ From d58d111f2e459c8e5c1f1c6f324a8ec9b277801a Mon Sep 17 00:00:00 2001 From: Muli Dayan Date: Mon, 5 Sep 2016 15:12:54 +0300 Subject: [PATCH 15/15] WP-93 remove unused variable --- view/library/browse.php | 1 - 1 file changed, 1 deletion(-) diff --git a/view/library/browse.php b/view/library/browse.php index 5b59663..4bca9b9 100644 --- a/view/library/browse.php +++ b/view/library/browse.php @@ -100,7 +100,6 @@ isLibrary ): ?> - type == Kaltura_Client_Enum_EntryType::MEDIA_CLIP && $mediaEntry->mediaType == Kaltura_Client_Enum_MediaType::VIDEO ); ?> isLibrary && $mediaEntry->isUserMediaOwner ): ?>