Issue #3392 MediaPicker in use by default and "Clear" button added.

e107_admin/image.php

@@ -1268,7 +1268,8 @@ class media_admin_ui extends e_admin_ui
 		}
 		else
 		{
-			echo $this->mediaSelectUpload();		
+			return $this->mediaManagerTabs();
+			//  echo $this->mediaSelectUpload();
 		}	
 		
 	}
@@ -1417,10 +1418,12 @@ class media_admin_ui extends e_admin_ui
 
 		$text = $frm->tabs($tabs, array('id'=>'admin-ui-media-manager', 'class'=>'media-manager'));
 
-		if($options['bbcode'] || E107_DEBUG_LEVEL > 0)
+	/*	if($options['bbcode'] || E107_DEBUG_LEVEL > 0)
 		{
-			$text .= $this->mediaManagerSaveButtons($options);
+
-		}
+		}*/
+
+		$text .= $this->mediaManagerSaveButtons($options);
 
 		$text .= $this->mediaManagerPlaceholders();
 
@@ -1435,6 +1438,9 @@ class media_admin_ui extends e_admin_ui
 	 */
 	function mediaSelectUpload($type='image') 
 	{
+	//	return $this->mediaManagerTabs();
+
+
 		$frm = e107::getForm();
 		$tp = e107::getParser();
 
@@ -1449,7 +1455,7 @@ class media_admin_ui extends e_admin_ui
 
 		if(deftrue('e_DEBUG_MEDIAPICKER'))
 		{
-			return $this->mediaManagerTabs();
+		//	return $this->mediaManagerTabs();
 		}
 
 
@@ -1701,11 +1707,21 @@ class media_admin_ui extends e_admin_ui
 
 	private function mediaManagerSaveButtons($options = array())
 	{
-		if(empty($options['bbcode']))
+		if(empty($options['bbcode'])) // media picker mode.
 		{
-			return null;
+			$text = "<div class='buttons-bar' style='display:none;text-align:right;padding-right:15px;'>
+			
+			<button id='etrigger-submit' style='display:none' type='submit' data-modal-submit-class='btn-danger' class=' submit e-media-select-file-none e-dialog-close' data-target-label='' data-bbcode='".$options['bbcode']."' data-target='".$this->getQuery('tagid')."' name='reset_value' value='reset'  >
+			<span>".LAN_CLEAR."</span>
+			</button>
+		
+			</div>";
+
+			return $text;
 		}
 
+		// bbcode/wysiwyg mode.
+
 		// hidden from view but used by javascript to re-create the button in the modal-footer.
 		// Tinymce will remove the 'display:none' when loaded.
 		$text = "<div id='media-manager-submit-buttons' class='buttons-bar' style='text-align:right;padding-right:15px;display:none;'>

e107_handlers/form_handler.php

@@ -958,20 +958,19 @@ class e_form
 	 */
 	function iconpicker($name, $default, $label, $options = array(), $ajax = true)
 	{
-		if(deftrue('e_DEBUG_MEDIAPICKER'))
+		//v2.2.0
-		{
 			$options['icon'] = 1;
 			$options['glyph'] = 1;
 			$options['w'] = 64;
 			$options['h'] = 64;
 
 			return $this->mediapicker($name, $default, $options);
-		}
 
-		$options['media'] = '_icon';
+
+	/*	$options['media'] = '_icon';
 		$options['legacyPath'] = "{e_IMAGE}icons";
 		
-		return $this->imagepicker($name, $default, $label, $options);
+		return $this->imagepicker($name, $default, $label, $options);*/
 		
 
 	}
@@ -1238,9 +1237,9 @@ class e_form
 
 		$cat = $tp->toDB(vartrue($sc_parameters['media']));
 
-		if(deftrue('e_DEBUG_MEDIAPICKER'))
+	//	if(deftrue('e_DEBUG_MEDIAPICKER'))
-		{
+	//	{
-
+			// v2.2.0
 			$sc_parameters['image'] = 1;
 			$sc_parameters['dropzone'] = 1;
 			if(!empty($sc_parameters['video'])) // bc fix
@@ -1249,7 +1248,7 @@ class e_form
 			}
 
 			return $this->mediapicker($name, $default, $sc_parameters);
-		}
+	//	}
 
 
 		if(empty($sc_parameters['media']))
@@ -5879,11 +5878,6 @@ class e_form
 			/** Generic Media Pick for combinations of images, audio, video, glyphs, files, etc. Field Type = json */
 			case 'media':
 
-				if(!deftrue('e_DEBUG_MEDIAPICKER'))
-				{
-					return null;
-				}
-
 				$max = varset($parms['max'],1);
 
 				$ret = '';

e107_web/js/core/admin.jquery.js

@@ -49,10 +49,18 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
 						{
 							var buttonCaption = $('#e-modal-iframe').contents().find('#etrigger-submit').text(); // copy submit button caption from iframe form.
 
+							var buttonClass = $('#e-modal-iframe').contents().find('#etrigger-submit').attr('data-modal-submit-class'); // co
 							if(buttonCaption)
 							{
 								$('#e-modal-submit').text(buttonCaption).fadeIn(); // display the button in the modal footer.
 							}
+
+							if(buttonClass)
+							{
+								$('#e-modal-submit').addClass(buttonClass);
+							}
+
+
 							$('#e-modal-iframe').contents().find('.buttons-bar').hide(); // hide buttons in the iframe's form.
 						}
 

e107_web/js/core/mediaManager.js

@@ -321,6 +321,8 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
 		{
 			$parentTarget.text(label);
 		}
+
+		console.log(label);
 	};