Media field style and layout

joomla · Oct 2, 2018 · bf4b374 · bf4b374
1 parent c31ff51
commit bf4b374
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 30 deletions.
diff --git a/administrator/components/com_media/views/images/tmpl/default.php b/administrator/components/com_media/views/images/tmpl/default.php
@@ -65,28 +65,30 @@
 ?>
 <div class="container-popup">
 
-	<form action="index.php?option=com_media&amp;asset=<?php echo $asset; ?>&amp;author=<?php echo $author; ?>" class="form-vertical" id="imageForm" method="post" enctype="multipart/form-data">
+	<form action="index.php?option=com_media&amp;asset=<?php echo $asset; ?>&amp;author=<?php echo $author; ?>" class="form-horizontal" id="imageForm" method="post" enctype="multipart/form-data">
 
 		<div id="messages" style="display: none;">
 			<span id="message"></span><?php echo JHtml::_('image', 'media/dots.gif', '...', array('width' => 22, 'height' => 12), true); ?>
 		</div>
 
 		<div class="well">
-			<div class="row">
-				<div class="span12 control-group">
+			<div class="row-fluid">
+				<div class="span7 control-group">
 					<div class="control-label">
-						<label class="control-label" for="folder"><?php echo JText::_('COM_MEDIA_DIRECTORY'); ?></label>
+						<label for="folder"><?php echo JText::_('COM_MEDIA_DIRECTORY'); ?></label>
 					</div>
 					<div class="controls">
 						<?php echo $this->folderList; ?>
 						<button class="btn" type="button" id="upbutton" title="<?php echo JText::_('COM_MEDIA_DIRECTORY_UP'); ?>"><?php echo JText::_('COM_MEDIA_UP'); ?></button>
 					</div>
 				</div>
-				<div class="pull-right">
-					<button class="btn btn-success button-save-selected" type="button" <?php if (!empty($onClick)) :
-					// This is for Mootools compatibility ?>onclick="<?php echo $onClick; ?>"<?php endif; ?> data-dismiss="modal"><?php echo JText::_('COM_MEDIA_INSERT'); ?></button>
-					<button class="btn button-cancel" type="button" onclick="window.parent.jQuery('.modal.in').modal('hide');<?php if (!empty($onClick)) :
-						// This is for Mootools compatibility ?>parent.jModalClose();<?php endif ?>" data-dismiss="modal"><?php echo JText::_('JCANCEL'); ?></button>
+				<div class="span5 control-group">
+					<div class="pull-right">
+						<button class="btn btn-success button-save-selected" type="button" <?php if (!empty($onClick)) :
+						// This is for Mootools compatibility ?>onclick="<?php echo $onClick; ?>"<?php endif; ?> data-dismiss="modal"><?php echo JText::_('COM_MEDIA_INSERT'); ?></button>
+						<button class="btn button-cancel" type="button" onclick="window.parent.jQuery('.modal.in').modal('hide');<?php if (!empty($onClick)) :
+							// This is for Mootools compatibility ?>parent.jModalClose();<?php endif ?>" data-dismiss="modal"><?php echo JText::_('JCANCEL'); ?></button>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -95,15 +97,20 @@
 
 		<div class="well">
 			<div class="row-fluid">
-				<div class="span6 control-group">
+				<div class="span12 control-group">
 					<div class="control-label">
 						<label for="f_url"><?php echo JText::_('COM_MEDIA_IMAGE_URL'); ?></label>
 					</div>
 					<div class="controls">
 						<input type="text" id="f_url" value="" />
 					</div>
 				</div>
-				<?php if (!$this->state->get('field.id')) : ?>
+			</div>
+		</div>
+
+		<?php if (!$this->state->get('field.id')) : ?>
+			<div class="well">
+				<div class="row-fluid">
 					<div class="span6 control-group">
 						<div class="control-label">
 							<label title="<?php echo JText::_('COM_MEDIA_ALIGN_DESC'); ?>" class="noHtmlTip" for="f_align"><?php echo JText::_('COM_MEDIA_ALIGN'); ?></label>
@@ -117,9 +124,7 @@
 							</select>
 						</div>
 					</div>
-				<?php endif; ?>
-			</div>
-			<?php if (!$this->state->get('field.id')) : ?>
+				</div>
 				<div class="row-fluid">
 					<div class="span6 control-group">
 						<div class="control-label">
@@ -161,13 +166,11 @@
 						</div>
 					</div>
 				</div>
-			<?php endif; ?>
-
 			<input type="hidden" id="dirPath" name="dirPath" />
 			<input type="hidden" id="f_file" name="f_file" />
 			<input type="hidden" id="tmpl" name="component" />
-
 		</div>
+		<?php endif; ?>
 	</form>
 
 	<?php if ($user->authorise('core.create', 'com_media')) : ?>

diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
@@ -7766,9 +7766,6 @@ ul.manager .height-50 .icon-folder-2 {
 	line-height: 35px;
 	font-size: 30px;
 }
-#imageForm {
-	margin: -25px 0 0;
-}
 #imageForm .well {
 	margin-bottom: 5px;
 }
@@ -8047,6 +8044,7 @@ body.modal-open {
 	padding: 0;
 	width: 100%;
 	height: auto;
+	max-height: none;
 }
 .modal-body .container-fluid {
 	padding-top: 15px;
@@ -8065,7 +8063,7 @@ body.modal-open {
 	}
 }
 .container-popup {
-	padding: 28px 10px 10px 10px;
+	padding: 10px;
 }
 body .navbar,
 body .navbar-fixed-top {

diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
@@ -7766,9 +7766,6 @@ ul.manager .height-50 .icon-folder-2 {
 	line-height: 35px;
 	font-size: 30px;
 }
-#imageForm {
-	margin: -25px 0 0;
-}
 #imageForm .well {
 	margin-bottom: 5px;
 }
@@ -8047,6 +8044,7 @@ body.modal-open {
 	padding: 0;
 	width: 100%;
 	height: auto;
+	max-height: none;
 }
 .modal-body .container-fluid {
 	padding-top: 15px;
@@ -8065,7 +8063,7 @@ body.modal-open {
 	}
 }
 .container-popup {
-	padding: 28px 10px 10px 10px;
+	padding: 10px;
 }
 body .navbar,
 body .navbar-fixed-top {

diff --git a/administrator/templates/isis/html/layouts/joomla/form/field/media.php b/administrator/templates/isis/html/layouts/joomla/form/field/media.php
@@ -93,7 +93,7 @@
 	data-url="<?php echo $url; ?>"
 	data-modal=".modal"
 	data-modal-width="100%"
-	data-modal-height="400px"
+	data-modal-height="640px"
 	data-input=".field-media-input"
 	data-button-select=".button-select"
 	data-button-clear=".button-clear"
@@ -112,7 +112,6 @@
 		array(
 			'title'       => JText::_('JLIB_FORM_CHANGE_IMAGE'),
 			'closeButton' => true,
-			'footer'      => '<a class="btn" data-dismiss="modal">' . JText::_('JCANCEL') . '</a>',
 		)
 	);
 

diff --git a/administrator/templates/isis/less/blocks/_media.less b/administrator/templates/isis/less/blocks/_media.less
@@ -9,7 +9,6 @@ ul.manager .height-50 .icon-folder-2 {
 }
 
 #imageForm {
-	margin: -25px 0 0;
 	.well {
 		margin-bottom: 5px;
 	}

diff --git a/administrator/templates/isis/less/blocks/_modals.less b/administrator/templates/isis/less/blocks/_modals.less
@@ -25,6 +25,7 @@ body.modal-open {
   padding: 0;
   width: 100%;
   height: auto;
+  max-height: none;
   .container-fluid {
     padding-top: 15px;
     padding-bottom: 15px;
@@ -48,5 +49,5 @@ body.modal-open {
 
 /* Component pop-up */
 .container-popup {
-	padding: 28px 10px 10px 10px;
+	padding: 10px;
 }
diff --git a/media/media/css/popup-imagelist.css b/media/media/css/popup-imagelist.css
@@ -3,6 +3,10 @@
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+.contentpane {
+	padding: 0 !important;
+}
+
 .item {
 	float: left;
 	border: 1px solid #ccc !important;
@@ -65,6 +69,7 @@ html>body .item img {
 
 .thumbnails.thumbnails-media {
 	margin-left: 0;
+	margin-bottom: 0;
 }
 .thumbnails-media .thumbnail {
 	background-color: #f4f4f4;

diff --git a/media/media/css/popup-imagemanager.css b/media/media/css/popup-imagemanager.css
@@ -3,6 +3,17 @@
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+@media only screen and (min-width: 768px) {
+	#imageForm .control-group,
+	#uploadform .control-group {
+	    margin-bottom: 0;
+	}
+}
+
+#uploadform.well {
+    margin-bottom: -26px;
+}
+
 img {
 	border: 0 none;
 }
@@ -32,7 +43,7 @@ iframe {
 }
 
 iframe#imageframe {
-	height: 200px;
+	height: 350px;
 }
 
 a:hover {