Task 6751298 overkill css popup thingy

css/admin.css

@@ -46,19 +46,25 @@
 .flowplayer-wrapper { width: 70%; display: inline-block; float: right;}
 @media only screen and (max-width: 940px) {.flowplayer-wrapper { width: 100%; float: none;} .form-table2.flowplayer-settings {width: 100% !important;}}
 
-
+/* POPUPS */
 #fv-player-popups-settings tr.data:nth-child(even) { background-color: #eee; }
 .fv-player-popup-remove { visibility: hidden; }
 td:hover > .fv-player-popup-remove { visibility: visible; }
 table.fv-player-popup-formats td:first-child { width: 72px }
-#fv_flowplayer_popups .inside label {
-  display: initial;
-  text-align: inherit;
-}
-#fv-player-popups-settings > tbody > tr > td:nth-child( 1 ) {
-  text-align: center;
-  max-width: 7px;
+#fv_flowplayer_popups .inside label {display: initial;text-align: inherit;}
+#fv-player-popups-settings > tbody > tr > td:nth-child( 1 ) {text-align: center;max-width: 7px;}
+
+.fv-player-popups-editable .hide-if-popups-editable,
+.fv-player-popups-editing .hide-if-popups-editing,
+.fv-player-popups-legacy .hide-if-popups-legacy,
+.fv-player-popups-preset .hide-if-popups-preset{
+  display:none;
 }
+.fv-player-popup-css-edit{margin-top: 0!important;}
+
+
+
+
 
 .fv-metabox-holder {
   padding-top:0!important;

css/flowplayer.css

@@ -924,3 +924,11 @@ article .entry-content .fvfp_admin_error p { line-height: 18px; }
 .flowplayer.chrome55fix video::-webkit-media-controls-panel {
   width: calc(100% + 48px);
 }
+
+
+
+.fv-player-popup-default { position: absolute; top: 10%; z-index: 20; text-align: center; width: 100%; color: #fff; }
+.fv-player-popup-default .fv_player_popup_content {  background: #555555; padding: 1% 5%; width: 65%; margin: 0 auto; }
+
+.fv-player-popup-tw { position: absolute; top: 10%; z-index: 20; text-align: center; width: 100%; color: #f88; }
+.fv-player-popup-tw .fv_player_popup_content {  background: #333333; padding: 1% 5%; width: 65%; margin: 0 auto; }

js/shortcode-editor.js

@@ -1077,7 +1077,11 @@ function fv_wp_flowplayer_submit( preview ) {
       if( jQuery('[name=fv_wp_flowplayer_field_popup]').val() !== ''){
         fv_wp_flowplayer_shortcode_write_arg('fv_wp_flowplayer_field_popup','popup','html');
       }else{
-        fv_wp_flowplayer_shortcode_write_arg('fv_wp_flowplayer_field_popup_id', 'popup', false, false, ['no','random','1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16'] );
+        var sPopup = jQuery('#fv_wp_flowplayer_field_popup_id').val();
+        if(sPopup){
+          fv_wp_fp_shortcode += ' popup="' + sPopup + '"';
+        }
+
       }
     break;
   }
@@ -1336,7 +1340,7 @@ function fv_wp_flowplayer_shortcode_write_arg( sField, sArg, sKind, bCheckbox, a
   if( typeof(element) == "undefined") {
     return false;
   }
-  
+
   var sValue = false;
   if( bCheckbox ) {
     if( element.checked ){

models/flowplayer-frontend.php

@@ -806,12 +806,13 @@ function get_popup_code() {
       }
     }
 
-    $sClass = ' fv_player_popup-'.$iPopupIndex;
+    $sClass = ' fv_player_popup-id_'.$iPopupIndex;
+    $sStyle = isset($aPopupData[$iPopupIndex]['css_preset']) ? $aPopupData[$iPopupIndex]['css_preset'] : 'default';
 
     $popup = apply_filters('fv_flowplayer_popup_html', $popup);
     if (strlen(trim($popup)) > 0) {
       $popup_contents = array(
-          'html' => '<div class="fv_player_popup'.$sClass.' wpfp_custom_popup_content">' . $popup . '</div>'
+          'html' => '<div id="'.$this->hash.'_custom_popup" class="wpfp_custom_popup fv-player-popup-'.$sStyle.'"><div class="fv_player_popup_content'.$sClass.' wpfp_custom_popup_content">' . $popup . '</div></div>'
       );
       return $popup_contents;
     }

models/flowplayer.php

@@ -254,14 +254,7 @@ public function _set_conf() {
     $sKey = $aNewOptions['key'];
 
     if(isset($aNewOptions['popups'])){
-      unset($aNewOptions['popups']['#fv_popup_dummy_key#']);
-
-      foreach( $aNewOptions['popups'] AS $key => $value ) {
-        $aNewOptions['popups'][$key]['css'] = stripslashes($value['css']);
-        $aNewOptions['popups'][$key]['html'] = stripslashes($value['html']);
-      }
-
-      update_option('fv_player_popups',$aNewOptions['popups']);
+      $this->popup_settings($aNewOptions['popups']);
       unset($aNewOptions['popups']);
     }
 
@@ -305,6 +298,45 @@ public function _set_conf() {
 
     return true;  
   }
+
+  private function popup_settings($aPopups) {
+      unset($aPopups['#fv_popup_dummy_key#']);
+      $aPopupCss = get_option('fv_player_popups_css',array());
+
+      foreach( $aPopups AS $key => $aPopupData ) {
+
+        //unset( $aPopups[$key]['css_preset_name']);
+        $aPopups[$key]['css'] = stripslashes($aPopupData['css']);
+        $aPopups[$key]['html'] = stripslashes($aPopupData['html']);
+
+        if(in_array($aPopupData['css_preset'], array('default','tw'))){
+          $aPopups[$key]['css'] = '';
+          $aPopups[$key]['css_preset_name'] = '';
+          $aPopups[$key]['css_preset_content'] = '';
+          continue;
+        }else if($aPopupData['css_preset'] === 'legacy'){
+          $aPopups[$key]['css_preset_name'] = '';
+          $aPopups[$key]['css_preset_content'] = '';
+          continue;
+        }
+
+
+        if(isset($aPopupData['css_preset']) && is_numeric($aPopupData['css_preset'])){
+
+          $aPopupCss[$aPopupData['css_preset']] = array(
+            'name' => $aPopupData['css_preset_name'],
+            'content' => trim($aPopupData['css_preset_content']),
+          );
+          $aPopups[$key]['css_preset'] = $aPopupData['css_preset'];
+          update_option('fv_player_popups_css',$aPopupCss);
+        }
+
+
+
+      }
+      update_option('fv_player_popups',$aPopups);
+
+  }
   /**
    * Salt function - returns pseudorandom string hash.
    * @return Pseudorandom string hash.
@@ -314,7 +346,7 @@ public function _salt() {
     return $salt;
   }
 
-  
+
   private function build_playlist_html( $aArgs, $sSplashImage, $sItemCaption ){
 
     if(isset($aArgs['liststyle']) && $aArgs['liststyle'] == 'vertical'){
@@ -559,7 +591,7 @@ function css_generate( $skip_style_tag = true ) {
     .flowplayer.fixed-controls { margin: 0 auto <?php echo $iMarginBottom+30; ?>px auto; display: block; }
     .flowplayer.has-abloop { margin-bottom: <?php echo $iMarginBottom+24; ?>px; }
     .flowplayer.fixed-controls.has-abloop { margin-bottom: <?php echo $iMarginBottom+30+24; ?>px; }
-    .flowplayer.has-caption, flowplayer.has-caption * { margin: 0 auto; }
+    .flowplayer.has-caption, .flowplayer.has-caption * { margin: 0 auto; }
     .flowplayer .fp-controls, .flowplayer .fv-ab-loop, .fv-player-buttons a:active, .fv-player-buttons a { color: <?php echo $fv_fp->_get_option('durationColor'); ?> !important; background-color: <?php echo $fv_fp->_get_option('backgroundColor'); ?> !important; }
     .flowplayer { background-color: <?php echo $fv_fp->_get_option('canvas'); ?> !important; }
     .flowplayer .fp-duration, .flowplayer a.fp-play, .flowplayer a.fp-mute { color: <?php echo $fv_fp->_get_option('durationColor'); ?> !important; }
@@ -580,7 +612,8 @@ function css_generate( $skip_style_tag = true ) {
     .fvplayer .me-cannotplay span { padding: 5px; }
     #content .fvplayer .mejs-container .mejs-controls div { font-family: <?php echo $fv_fp->_get_option('font-face'); ?>; }
 
-    .wpfp_custom_background { display: none; }  
+
+    .wpfp_custom_background { display: none; }
     .wpfp_custom_popup { position: absolute; top: 10%; z-index: 20; text-align: center; width: 100%; color: #fff; }
     .is-finished .wpfp_custom_background { display: block; }  
     .fv_player_popup {  background: <?php echo $fv_fp->_get_option('backgroundColor') ?>; padding: 1% 5%; width: 65%; margin: 0 auto; }
@@ -885,7 +918,7 @@ public static function get_duration( $post_id, $video_src ) {
 
 
   public static function get_duration_post( $post_id = false ) {
-    global $post, $fv_fp;
+    global $post;
     $post_id = ( $post_id ) ? $post_id : $post->ID;
 
     $content = false;
@@ -1302,16 +1335,23 @@ function css_writeout_option() {
 
 
   function popup_css( $css ){
-    $aPopupData = get_option('fv_player_popups');
+    $aPopupData = get_option('fv_player_popups',array());
     $sNewCss = '';
-    if( is_array($aPopupData) ) {
-      foreach($aPopupData as $key => $val){
-        if( empty($val['css']) ){
-          continue;
-        }
-        $sNewCss .= stripslashes($val['css'])."\n";
+    foreach($aPopupData as $key => $val){       
+      if( empty($val['css']) ){
+        continue;
       }
+      $sNewCss .= stripslashes($val['css'])."\n";
     }
+
+    $aPopupData = get_option('fv_player_popups_css',array());
+    foreach($aPopupData as $key => $val){       
+      if( empty($val['content']) ){
+        continue;
+      }
+      $sNewCss .= stripslashes($val['content'])."\n";
+    }
+
     if( strlen($sNewCss) ){
       $css .= "\n/*custom popup css*/\n".$sNewCss."/*end custom popup css*/\n";
     }
@@ -1365,7 +1405,6 @@ function template_embed_buffer(){
     if( get_query_var('fv_player_embed') ) {
       ob_start();
 
-      global $fvseo;
       if( isset($_REQUEST['fv_player_preview']) ) {
         global $fvseo;
         if( isset($fvseo) ) remove_action('wp_footer', array($fvseo, 'script_footer_content'), 999999 );
@@ -1388,8 +1427,8 @@ function template_embed() {
       ?>
   <style>
     body { margin: 0; padding: 0; overflow:hidden; background:white;}
-    body:before { height: 0px!important;}
-    html {margin-top: 0px !important;}
+    body:before { height: 0!important;}
+    html {margin-top: 0!important;}
   </style>
 </head>
 <body class="fv-player-preview">