Merge remote-tracking branch 'origin/master'

Author: cheesegrits

administrator/components/com_fabrik/views/packages/tmpl/bootstrap.php

@@ -132,5 +132,16 @@
 </form>
 <?php
 else:
+	if(!empty( $this->sidebar)): ?>
+<div id="j-sidebar-container" class="span2">
+	<?php echo $this->sidebar; ?>
+</div>
+<div id="j-main-container" class="span10">
+	<?php else : ?>
+	<div id="j-main-container">
+		<?php endif;
 	echo FText::_('COM_FABRIK_PACKAGES_REMOVED');
-endif; ?>
+		?>
+		</div>
+<?php endif; ?>
+

administrator/components/com_fabrik/views/packages/view.html.php

@@ -92,9 +92,11 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		require_once JPATH_COMPONENT . '/helpers/fabrik.php';
+
 		$canDo = FabrikAdminHelper::getActions($this->state->get('filter.category_id'));
 		JToolBarHelper::title(FText::_('COM_FABRIK_MANAGER_PACKAGES'), 'box-add');
 
+		/*
 		if ($canDo->get('core.create'))
 		{
 			JToolBarHelper::addNew('package.add', 'JTOOLBAR_NEW');
@@ -131,6 +133,8 @@ protected function addToolbar()
 			JToolBarHelper::trash('packages.trash', 'JTOOLBAR_TRASH');
 		}
 
+		*/
+
 		if ($canDo->get('core.admin'))
 		{
 			JToolBarHelper::divider();
@@ -140,6 +144,7 @@ protected function addToolbar()
 		JToolBarHelper::divider();
 		JToolBarHelper::help('JHELP_COMPONENTS_FABRIK_PACKAGES', false, FText::_('JHELP_COMPONENTS_FABRIK_PACKAGES'));
 
+		/*
 		if (FabrikWorker::j3())
 		{
 			JHtmlSidebar::setAction('index.php?option=com_fabrik&view=packages');
@@ -151,5 +156,6 @@ protected function addToolbar()
 			JHtml::_('select.options', $publishOpts, 'value', 'text', $this->state->get('filter.published'), true)
 			);
 		}
+		*/
 	}
 }