Use ted skin + folders js/css

administrator/components/com_admin/script.php

@@ -1082,6 +1082,8 @@ public function deleteUnexistingFiles()
 			'/libraries/joomla/registry/format/json.php',
 			'/libraries/joomla/registry/format/php.php',
 			'/libraries/joomla/registry/format/xml.php',
+			// Joomla 3.3.1
+			'/administrator/templates/isis/html/message.php',
 			// Joomla! 3.4
 			'/administrator/components/com_tags/helpers/html/index.html',
 			'/administrator/components/com_tags/models/fields/index.html',

administrator/components/com_config/model/application.php

@@ -97,6 +97,27 @@ public function save($data)
 	{
 		$app = JFactory::getApplication();
 
+		// Check that we aren't setting wrong database configuration
+		$options = array(
+			'driver'   => $data['dbtype'],
+			'host'     => $data['host'],
+			'user'     => $data['user'],
+			'password' => JFactory::getConfig()->get('password'),
+			'database' => $data['db'],
+			'prefix'   => $data['dbprefix']
+		);
+
+		try
+		{
+			$dbc = JDatabaseDriver::getInstance($options)->getVersion();
+		}
+		catch (Exception $e)
+		{
+			$app->enqueueMessage(JText::_('JLIB_DATABASE_ERROR_DATABASE_CONNECT'), 'error');
+
+			return false;
+		}
+
 		// Save the rules
 		if (isset($data['rules']))
 		{

administrator/components/com_content/models/article.php

@@ -444,6 +444,12 @@ protected function loadFormData()
 			}
 		}
 
+		// If there are params fieldsets in the form it will fail with a registry object
+		if (isset($data->params) && $data->params instanceof Registry)
+		{
+			$data->params = $data->params->toArray();
+		}
+
 		$this->preprocessData('com_content.article', $data);
 
 		return $data;

administrator/components/com_installer/views/database/tmpl/default.php

@@ -37,7 +37,7 @@
 				<fieldset class="panelform">
 						<ul>
 						<?php if (!$this->filterParams) : ?>
-							<li><?php echo JText::_('COM_INSTALLER_MSG_DATABASE_FILTER_ERROR'); ?>
+							<li><?php echo JText::_('COM_INSTALLER_MSG_DATABASE_FILTER_ERROR'); ?></li>
 						<?php endif; ?>
 
 						<?php if ($this->schemaVersion != $this->changeSet->getSchema()) : ?>
@@ -76,6 +76,7 @@
 					</fieldset>
 				</div>
 				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 
 			<input type="hidden" name="task" value="" />
 			<input type="hidden" name="boxchecked" value="0" />

administrator/components/com_installer/views/install/tmpl/default.php

@@ -12,15 +12,19 @@
 // MooTools is loaded for B/C for extensions generating JavaScript in their install scripts, this call will be removed at 4.0
 JHtml::_('behavior.framework', true);
 JHtml::_('bootstrap.tooltip');
+
+JText::script('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE');
+JText::script('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_DIRECTORY');
+JText::script('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL');
 ?>
 <script type="text/javascript">
 	Joomla.submitbutton = function()
 	{
 		var form = document.getElementById('adminForm');
 
 		// do field validation
-		if (form.install_package.value == ""){
-			alert("<?php echo JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE', true); ?>");
+		if (form.install_package.value == "") {
+			alert(Joomla.JText._('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE'));
 		}
 		else
 		{
@@ -36,8 +40,8 @@
 		var form = document.getElementById('adminForm');
 
 		// do field validation
-		if (form.install_directory.value == ""){
-			alert("<?php echo JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_DIRECTORY', true); ?>");
+		if (form.install_directory.value == "") {
+			alert(Joomla.JText._('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_DIRECTORY'));
 		}
 		else
 		{
@@ -53,8 +57,8 @@
 		var form = document.getElementById('adminForm');
 
 		// do field validation
-		if (form.install_url.value == "" || form.install_url.value == "http://"){
-			alert("<?php echo JText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL', true); ?>");
+		if (form.install_url.value == "" || form.install_url.value == "http://") {
+			alert(Joomla.JText._('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL'));
 		}
 		else
 		{
@@ -78,24 +82,32 @@
 	jQuery(document).ready(function($) {
 		var outerDiv = $('#installer-install');
 
-		$('<div id="loading"></div>')
-			.css("background", "rgba(255, 255, 255, .8) url('../media/jui/img/ajax-loader.gif') 50% 15% no-repeat")
-			.css("top", outerDiv.position().top - $(window).scrollTop())
-			.css("left", outerDiv.position().left - $(window).scrollLeft())
-			.css("width", outerDiv.width())
-			.css("height", outerDiv.height())
-			.css("position", "fixed")
-			.css("opacity", "0.80")
-			.css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)")
-			.css("filter", "alpha(opacity = 80)")
-			.css("display", "none")
-			.appendTo(outerDiv);
+		$('#loading').css({
+			'top': 		outerDiv.position().top - $(window).scrollTop(),
+			'left': 	outerDiv.position().left - $(window).scrollLeft(),
+			'width': 	outerDiv.width(),
+			'height': 	outerDiv.height(),
+			'display':  'none'
+		});
 	});
-
 </script>
+<style type="text/css">
+	#loading {
+		background: rgba(255, 255, 255, .8) url('<?php echo JHtml::_('image', 'jui/ajax-loader.gif', '', null, true, true); ?>') 50% 15% no-repeat;
+		position: fixed;
+		opacity: 0.8;
+		-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity = 80);
+		filter: alpha(opacity = 80);
+	}
+
+	.j-jed-message {
+		margin-bottom: 40px;
+		line-height: 2em;
+		color:#333333;
+	}
+</style>
 
 <div id="installer-install" class="clearfix">
-<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_installer&view=install');?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
 	<?php if (!empty( $this->sidebar)) : ?>
 		<div id="j-sidebar-container" class="span2">
 			<?php echo $this->sidebar; ?>
@@ -105,80 +117,82 @@
 		<div id="j-main-container">
 	<?php endif;?>
 
-	<!-- Render messages set by extension install scripts here -->
-	<?php if ($this->showMessage) : ?>
-		<?php echo $this->loadTemplate('message'); ?>
-	<?php elseif ($this->showJedAndWebInstaller) : ?>
-		<div class="alert alert-info j-jed-message" style="margin-bottom: 40px; line-height: 2em; color:#333333;">
-			<a href="index.php?option=com_config&view=component&component=com_installer&path=&return=<?php echo urlencode(base64_encode(JUri::getInstance())); ?>" class="close hasTooltip" data-dismiss="alert" title="<?php echo str_replace('"', '&quot;', JText::_('COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP')); ?>">&times;</a>
-			<p><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_INFO'); ?>&nbsp;&nbsp;<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_TOS'); ?></p>
-			<input class="btn" type="button" value="<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB'); ?>" onclick="Joomla.submitbuttonInstallWebInstaller()" />
-		</div>
-	<?php endif; ?>
+		<!-- Render messages set by extension install scripts here -->
+		<?php if ($this->showMessage) : ?>
+			<?php echo $this->loadTemplate('message'); ?>
+		<?php elseif ($this->showJedAndWebInstaller) : ?>
+			<div class="alert alert-info j-jed-message">
+				<a href="<?php echo JRoute::_('index.php?option=com_config&view=component&component=com_installer&path=&return=' . urlencode(base64_encode(JUri::getInstance()))); ?>" class="close hasTooltip" data-dismiss="alert" title="<?php echo $this->escape(JText::_('COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP')); ?>">&times;</a>
+				<p><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_INFO'); ?>&nbsp;&nbsp;<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_TOS'); ?></p>
+				<button class="btn" type="button" onclick="Joomla.submitbuttonInstallWebInstaller()"><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB'); ?></button>
+			</div>
+		<?php endif; ?>
 
-	<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'upload')); ?>
+		<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_installer&view=install');?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+			<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'upload')); ?>
 
-			<?php JEventDispatcher::getInstance()->trigger('onInstallerViewBeforeFirstTab', array()); ?>
+				<?php JEventDispatcher::getInstance()->trigger('onInstallerViewBeforeFirstTab', array()); ?>
 
-			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JText::_('COM_INSTALLER_UPLOAD_PACKAGE_FILE', true)); ?>
-			<fieldset class="uploadform">
-				<legend><?php echo JText::_('COM_INSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION'); ?></legend>
-				<div class="control-group">
-					<label for="install_package" class="control-label"><?php echo JText::_('COM_INSTALLER_EXTENSION_PACKAGE_FILE'); ?></label>
-					<div class="controls">
-						<input class="input_box" id="install_package" name="install_package" type="file" size="57" />
+				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JText::_('COM_INSTALLER_UPLOAD_PACKAGE_FILE', true)); ?>
+				<fieldset class="uploadform">
+					<legend><?php echo JText::_('COM_INSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION'); ?></legend>
+					<div class="control-group">
+						<label for="install_package" class="control-label"><?php echo JText::_('COM_INSTALLER_EXTENSION_PACKAGE_FILE'); ?></label>
+						<div class="controls">
+							<input class="input_box" id="install_package" name="install_package" type="file" size="57" />
+						</div>
 					</div>
-				</div>
-				<div class="form-actions">
-					<input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_INSTALLER_UPLOAD_AND_INSTALL'); ?>" onclick="Joomla.submitbutton()" />
-				</div>
-			</fieldset>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
-
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_INSTALLER_INSTALL_FROM_DIRECTORY', true)); ?>
-			<fieldset class="uploadform">
-				<legend><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_DIRECTORY'); ?></legend>
-				<div class="control-group">
-					<label for="install_directory" class="control-label"><?php echo JText::_('COM_INSTALLER_INSTALL_DIRECTORY'); ?></label>
-					<div class="controls">
-						<input type="text" id="install_directory" name="install_directory" class="span5 input_box" size="70" value="<?php echo $this->state->get('install.directory'); ?>" />
+					<div class="form-actions">
+						<button class="btn btn-primary" type="button" onclick="Joomla.submitbutton()"><?php echo JText::_('COM_INSTALLER_UPLOAD_AND_INSTALL'); ?></button>
 					</div>
-				</div>
-				<div class="form-actions">
-					<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_INSTALLER_INSTALL_BUTTON'); ?>" onclick="Joomla.submitbutton3()" />
-				</div>
-			</fieldset>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
-
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JText::_('COM_INSTALLER_INSTALL_FROM_URL', true)); ?>
-			<fieldset class="uploadform">
-				<legend><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_URL'); ?></legend>
-				<div class="control-group">
-					<label for="install_url" class="control-label"><?php echo JText::_('COM_INSTALLER_INSTALL_URL'); ?></label>
-					<div class="controls">
-						<input type="text" id="install_url" name="install_url" class="span5 input_box" size="70" value="http://" />
+				</fieldset>
+				<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_INSTALLER_INSTALL_FROM_DIRECTORY', true)); ?>
+				<fieldset class="uploadform">
+					<legend><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_DIRECTORY'); ?></legend>
+					<div class="control-group">
+						<label for="install_directory" class="control-label"><?php echo JText::_('COM_INSTALLER_INSTALL_DIRECTORY'); ?></label>
+						<div class="controls">
+							<input type="text" id="install_directory" name="install_directory" class="span5 input_box" size="70" value="<?php echo $this->state->get('install.directory'); ?>" />
+						</div>
 					</div>
-				</div>
-				<div class="form-actions">
-					<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_INSTALLER_INSTALL_BUTTON'); ?>" onclick="Joomla.submitbutton4()" />
-				</div>
-			</fieldset>
-
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
-
-		<?php JEventDispatcher::getInstance()->trigger('onInstallerViewAfterLastTab', array()); ?>
-
-		<?php if ($this->ftp) : ?>
-			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'ftp', JText::_('COM_INSTALLER_MSG_DESCFTPTITLE', true)); ?>
-				<?php echo $this->loadTemplate('ftp'); ?>
-			<?php echo JHtml::_('bootstrap.endTab'); ?>
-		<?php endif; ?>
-
-	<input type="hidden" name="type" value="" />
-	<input type="hidden" name="installtype" value="upload" />
-	<input type="hidden" name="task" value="install.install" />
-	<?php echo JHtml::_('form.token'); ?>
-
-	<?php echo JHtml::_('bootstrap.endTabSet'); ?>
-</form>
-</div>
+					<div class="form-actions">
+						<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton3()"><?php echo JText::_('COM_INSTALLER_INSTALL_BUTTON'); ?></button>
+					</div>
+				</fieldset>
+				<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JText::_('COM_INSTALLER_INSTALL_FROM_URL', true)); ?>
+				<fieldset class="uploadform">
+					<legend><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_URL'); ?></legend>
+					<div class="control-group">
+						<label for="install_url" class="control-label"><?php echo JText::_('COM_INSTALLER_INSTALL_URL'); ?></label>
+						<div class="controls">
+							<input type="text" id="install_url" name="install_url" class="span5 input_box" size="70" value="http://" />
+						</div>
+					</div>
+					<div class="form-actions">
+						<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton4()"><?php echo JText::_('COM_INSTALLER_INSTALL_BUTTON'); ?></button>
+					</div>
+				</fieldset>
+				<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+				<?php JEventDispatcher::getInstance()->trigger('onInstallerViewAfterLastTab', array()); ?>
+
+				<?php if ($this->ftp) : ?>
+					<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'ftp', JText::_('COM_INSTALLER_MSG_DESCFTPTITLE', true)); ?>
+						<?php echo $this->loadTemplate('ftp'); ?>
+					<?php echo JHtml::_('bootstrap.endTab'); ?>
+				<?php endif; ?>
+
+			<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+			<input type="hidden" name="type" value="" />
+			<input type="hidden" name="installtype" value="upload" />
+			<input type="hidden" name="task" value="install.install" />
+			<?php echo JHtml::_('form.token'); ?>
+		</form>
+	</div>
+	<div id="loading"></div>
+</div>

administrator/components/com_joomlaupdate/views/default/view.html.php

@@ -40,7 +40,7 @@ public function display($tpl = null)
 		$this->assign('methodSelect', JoomlaupdateHelperSelect::getMethods($ftp['enabled']));
 
 		// Set the toolbar information.
-		JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'arrow-up-2 install');
+		JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install');
 		JToolbarHelper::custom('update.purge', 'purge', 'purge', 'JTOOLBAR_PURGE_CACHE', false);
 
 		// Add toolbar buttons.

administrator/components/com_joomlaupdate/views/update/view.html.php

@@ -31,7 +31,7 @@ public function display($tpl=null)
 		$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise';
 
 		// Set the toolbar information.
-		JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'arrow-up-2 install');
+		JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install');
 		JToolBarHelper::divider();
 		JToolBarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE');
 

administrator/components/com_media/models/list.php

@@ -116,6 +116,7 @@ public function getList()
 		$images  = array ();
 		$folders = array ();
 		$docs    = array ();
+		$videos  = array ();
 
 		$fileList   = false;
 		$folderList = false;
@@ -187,6 +188,13 @@ public function getList()
 							$images[] = $tmp;
 							break;
 
+						// Video
+						case 'mp4':
+							$tmp->icon_32 = "media/mime-icon-32/" . $ext . ".png";
+							$tmp->icon_16 = "media/mime-icon-16/" . $ext . ".png";
+							$videos[] = $tmp;
+							break;
+
 						// Non-image document
 						default:
 							$tmp->icon_32 = "media/mime-icon-32/" . $ext . ".png";
@@ -215,8 +223,22 @@ public function getList()
 			}
 		}
 
-		$list = array('folders' => $folders, 'docs' => $docs, 'images' => $images);
+		$list = array('folders' => $folders, 'docs' => $docs, 'images' => $images, 'videos' => $videos);
 
 		return $list;
 	}
+
+	/**
+	 * Get the videos on the current folder
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function getVideos()
+	{
+		$list = $this->getList();
+
+		return $list['videos'];
+	}
 }

administrator/components/com_media/views/images/tmpl/default.php

@@ -14,9 +14,20 @@
 // Load tooltip instance without HTML support because we have a HTML tag in the tip
 JHtml::_('bootstrap.tooltip', '.noHtmlTip', array('html' => false));
 
-$user  = JFactory::getUser();
-$input = JFactory::getApplication()->input;
+$user   = JFactory::getUser();
+$input  = JFactory::getApplication()->input;
 $params = JComponentHelper::getParams('com_media');
+$lang   = JFactory::getLanguage();
+
+// Include jQuery
+JHtml::_('jquery.framework');
+JHtml::_('script', 'media/popup-imagemanager.js', false, true);
+JHtml::_('stylesheet', 'media/popup-imagemanager.css', array(), true);
+
+if ($lang->isRtl())
+{
+	JHtml::_('stylesheet', 'media/popup-imagemanager_rtl.css', array(), true);
+}
 
 JFactory::getDocument()->addScriptDeclaration(
 	"