template atum conflicts resolved

joomla · Aug 22, 2018 · 4fa0d64 · 4fa0d64
1 parent 2a69c4e
commit 4fa0d64
Show file tree

Hide file tree

Showing 22 changed files with 1,823 additions and 1,558 deletions.
diff --git a/administrator/components/com_media/package-lock.json b/administrator/components/com_media/package-lock.json
diff --git a/administrator/templates/atum/css/bootstrap.css b/administrator/templates/atum/css/bootstrap.css
@@ -3173,7 +3173,7 @@ input[type="button"].btn-block {
   padding: 0.75rem 1rem;
   margin-bottom: 1rem;
   list-style: none;
-  background-color: #e9ecef; }
+  background-color: #fff; }
 
 .breadcrumb-item + .breadcrumb-item {
   padding-left: 0.5rem; }

diff --git a/administrator/templates/atum/css/bootstrap.min.css b/administrator/templates/atum/css/bootstrap.min.css
diff --git a/administrator/templates/atum/css/template-rtl.css b/administrator/templates/atum/css/template-rtl.css
@@ -448,7 +448,6 @@ legend {
 
 .header {
   position: relative;
-  z-index: 1060;
   background: #fff;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25); }
   .header .logo {
@@ -1498,7 +1497,7 @@ iframe {
 
 .sysinfo .table {
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25); }
-  .sysinfo .table  th {
+  .sysinfo .table th {
     font-weight: bold; }
 
 .com_config .content {

diff --git a/administrator/templates/atum/css/template-rtl.min.css b/administrator/templates/atum/css/template-rtl.min.css
diff --git a/administrator/templates/atum/css/template.css b/administrator/templates/atum/css/template.css
@@ -448,7 +448,6 @@ legend {
 
 .header {
   position: relative;
-  z-index: 1060;
   background: #fff;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25); }
   .header .logo {
@@ -1498,7 +1497,7 @@ iframe {
 
 .sysinfo .table {
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25); }
-  .sysinfo .table  th {
+  .sysinfo .table th {
     font-weight: bold; }
 
 .com_config .content {

diff --git a/administrator/templates/atum/css/template.min.css b/administrator/templates/atum/css/template.min.css
diff --git a/administrator/templates/atum/html/com_patchtester_meins/pulls/default.php b/administrator/templates/atum/html/com_patchtester_meins/pulls/default.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Patch testing component for the Joomla! CMS
+ *
+ * @copyright  Copyright (C) 2011 - 2012 Ian MacLennan, Copyright (C) 2013 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later
+ */
+
+/** @var  \PatchTester\View\Pulls\PullsHtmlView  $this */
+
+$searchToolsOptions = array(
+	'filtersHidden'       => true,
+	'filterButton'        => true,
+	'defaultLimit'        => JFactory::getApplication()->get('list_limit', 20),
+	'searchFieldSelector' => '#filter_search',
+	'selectorFieldName'   => 'client_id',
+	'showSelector'        => false,
+	'orderFieldSelector'  => '#sortTable',
+	'showNoResults'       => false,
+	'noResultsText'       => '',
+	'formSelector'        => '#adminForm',
+);
+
+\JHtml::_('behavior.core');
+\JHtml::_('bootstrap.tooltip');
+\JHtml::_('searchtools.form', '#adminForm', $searchToolsOptions);
+\JHtml::_('stylesheet', 'com_patchtester/octicons.css', array('version' => 'auto', 'relative' => true));
+\JHtml::_('script', 'com_patchtester/patchtester.js', array('version' => 'auto', 'relative' => true));
+
+$listOrder     = $this->escape($this->state->get('list.ordering'));
+$listDirn      = $this->escape($this->state->get('list.direction', 'desc'));
+$filterApplied = $this->escape($this->state->get('filter.applied'));
+$filterBranch  = $this->escape($this->state->get('filter.branch'));
+$filterRtc     = $this->escape($this->state->get('filter.rtc'));
+$colSpan       = $this->trackerAlias !== false ? 8 : 7;
+?>
+<form action="<?php echo \JRoute::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm" id="adminForm" data-order="<?php echo $listOrder; ?>">
+	<div class="row">
+		<div class="col-md-12">
+			<div id="j-main-container" class="j-main-container">
+				<div class="js-stools" role="search">
+					<div class="js-stools-container-bar">
+						<label for="filter_search" class="sr-only">
+							<?php echo \JText::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?>
+						</label>
+						<div class="btn-toolbar">
+							<div class="btn-group mr-2">
+								<div class="input-group">
+									<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="form-control" title="<?php echo \JText::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?>" placeholder="<?php echo \JText::_('JSEARCH_FILTER'); ?>">
+									<span class="input-group-append">
+										<button type="submit" class="btn btn-primary hasTooltip" title="<?php echo \JHtml::_('tooltipText', 'JSEARCH_FILTER_SUBMIT'); ?>" aria-label="<?php echo \JText::_('JSEARCH_FILTER_SUBMIT'); ?>">
+											<span class="fa fa-search" aria-hidden="true"></span>
+										</button>
+									</span>
+								</div>
+							</div>
+							<button type="button" class="btn btn-primary hasTooltip js-stools-btn-clear mr-2" title="<?php echo \JHtml::_('tooltipText', 'JSEARCH_FILTER_CLEAR'); ?>">
+								<?php echo \JText::_('JSEARCH_FILTER_CLEAR'); ?>
+							</button>
+							<div class="btn-group">
+								<button type="button" class="btn btn-primary hasTooltip js-stools-btn-filter">
+									<?php echo \JText::_('JTABLE_OPTIONS'); ?>
+									<span class="fa fa-caret-down" aria-hidden="true"></span>
+								</button>
+							</div>
+						</div>
+					</div>
+					<!-- Filters div -->
+					<div class="js-stools-container-filters clearfix">
+						<div class="ordering-select">
+							<div class="js-stools-field-list">
+								<select name="sortTable" id="sortTable" class="custom-select" onchange="PatchTester.orderTable()">
+									<option value=""><?php echo \JText::_('JGLOBAL_SORT_BY'); ?></option>
+									<?php echo \JHtml::_('select.options', $this->getSortFields(), 'value', 'text', $listOrder); ?>
+								</select>
+							</div>
+							<div class="js-stools-field-list">
+								<select name="directionTable" id="directionTable" class="custom-select" onchange="PatchTester.orderTable()">
+									<option value=""><?php echo \JText::_('JFIELD_ORDERING_DESC');?></option>
+									<option value="asc"<?php if (strtolower($listDirn) === 'asc') echo ' selected="selected"'; ?>><?php echo \JText::_('JGLOBAL_ORDER_ASCENDING'); ?></option>
+									<option value="desc"<?php if (strtolower($listDirn) === 'desc') echo ' selected="selected"'; ?>><?php echo \JText::_('JGLOBAL_ORDER_DESCENDING'); ?></option>
+								</select>
+							</div>
+						</div>
+						<div class="js-stools-field-filter">
+							<select name="filter_applied" class="custom-select" onchange="this.form.submit();">
+								<option value=""><?php echo \JText::_('COM_PATCHTESTER_FILTER_APPLIED_PATCHES'); ?></option>
+								<option value="yes"<?php if ($filterApplied == 'yes') echo ' selected="selected"'; ?>><?php echo \JText::_('COM_PATCHTESTER_APPLIED'); ?></option>
+								<option value="no"<?php if ($filterApplied == 'no') echo ' selected="selected"'; ?>><?php echo \JText::_('COM_PATCHTESTER_NOT_APPLIED'); ?></option>
+							</select>
+						</div>
+						<div class="js-stools-field-filter">
+							<select name="filter_rtc" class="custom-select" onchange="this.form.submit();">
+								<option value=""><?php echo \JText::_('COM_PATCHTESTER_FILTER_RTC_PATCHES'); ?></option>
+								<option value="yes"<?php if ($filterRtc == 'yes') echo ' selected="selected"'; ?>><?php echo \JText::_('COM_PATCHTESTER_RTC'); ?></option>
+								<option value="no"<?php if ($filterRtc == 'no') echo ' selected="selected"'; ?>><?php echo \JText::_('COM_PATCHTESTER_NOT_RTC'); ?></option>
+							</select>
+						</div>
+						<div class="js-stools-field-filter">
+							<select name="filter_branch" class="custom-select" onchange="this.form.submit();">
+								<option value=""><?php echo \JText::_('COM_PATCHTESTER_FILTER_BRANCH'); ?></option>
+								<?php echo \JHtml::_('select.options', $this->branches, 'text', 'text', $filterBranch, false); ?>
+							</select>
+						</div>
+					</div>
+				</div>
+				<div id="j-main-container" class="j-main-container">
+					<?php if (empty($this->items)) : ?>
+						<div class="alert alert-warning alert-no-items">
+							<?php echo \JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+						</div>
+					<?php else : ?>
+						<table class="table">
+							<thead>
+								<tr>
+									<th width="5%" class="nowrap text-center">
+										<?php echo \JText::_('COM_PATCHTESTER_PULL_ID'); ?>
+									</th>
+									<th class="nowrap">
+										<?php echo \JText::_('JGLOBAL_TITLE'); ?>
+									</th>
+									<th width="8%" class="nowrap text-center">
+										<?php echo \JText::_('COM_PATCHTESTER_BRANCH'); ?>
+									</th>
+									<th width="8%" class="nowrap text-center">
+										<?php echo \JText::_('COM_PATCHTESTER_READY_TO_COMMIT'); ?>
+									</th>
+									<th width="8%" class="nowrap text-center">
+										<?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
+									</th>
+									<?php if ($this->trackerAlias !== false) : ?>
+										<th width="8%" class="nowrap text-center">
+											<?php echo \JText::_('COM_PATCHTESTER_JISSUES'); ?>
+										</th>
+									<?php endif; ?>
+									<th width="10%" class="nowrap text-center">
+										<?php echo \JText::_('JSTATUS'); ?>
+									</th>
+									<th width="15%" class="nowrap text-center">
+										<?php echo \JText::_('COM_PATCHTESTER_TEST_THIS_PATCH'); ?>
+									</th>
+								</tr>
+							</thead>
+							<tbody>
+								<?php echo $this->loadTemplate('items'); ?>
+							</tbody>
+						</table>
+					<?php endif; ?>
+
+					<?php echo $this->pagination->getListFooter(); ?>
+
+					<input type="hidden" name="task" value="" />
+					<input type="hidden" name="boxchecked" value="0" />
+					<input type="hidden" name="pull_id" id="pull_id" value="" />
+					<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+					<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+					<?php echo \JHtml::_('form.token'); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>
diff --git a/administrator/templates/atum/html/com_patchtester_meins/pulls/default_items.php b/administrator/templates/atum/html/com_patchtester_meins/pulls/default_items.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Patch testing component for the Joomla! CMS
+ *
+ * @copyright  Copyright (C) 2011 - 2012 Ian MacLennan, Copyright (C) 2013 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later
+ */
+
+/** @var \PatchTester\View\DefaultHtmlView $this */
+
+foreach ($this->items as $i => $item) :
+	$status = '';
+
+	if ($item->applied) :
+		$status = ' class="table-active"';
+	endif;
+?>
+<tr<?php echo $status; ?>>
+	<td class="text-center">
+		<?php echo $item->pull_id; ?>
+	</td>
+	<td>
+		<span class="hasTooltip" title="<strong>Info</strong><br/><?php echo $this->escape($item->description); ?>"><?php echo $this->escape($item->title); ?></span>
+		<?php if ($item->applied) : ?>
+			<div>
+				<span class="badge badge-info"><?php echo \JText::sprintf('COM_PATCHTESTER_APPLIED_COMMIT_SHA', substr($item->sha, 0, 10)); ?></span>
+			</div>
+		<?php endif; ?>
+	</td>
+	<td class="text-center">
+		<?php echo $this->escape($item->branch); ?>
+	</td>
+	<td class="text-center">
+		<?php if ($item->is_rtc) : ?>
+			<span class="badge badge-success"><?php echo \JText::_('JYES'); ?></span>
+		<?php else : ?>
+			<span class="badge badge-secondary"><?php echo \JText::_('JNO'); ?></span>
+		<?php endif; ?>
+	</td>
+	<td class="text-center">
+		<a class="btn btn-sm btn-info" href="<?php echo $item->pull_url; ?>" target="_blank">
+			<span class="octicon octicon-mark-github"></span> <?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
+		</a>
+	</td>
+	<?php if ($this->trackerAlias !== false) : ?>
+	<td class="text-center">
+		<a class="btn btn-sm btn-warning" href="https://issues.joomla.org/tracker/<?php echo $this->trackerAlias; ?>/<?php echo $item->pull_id; ?>" target="_blank">
+			<i class="icon-joomla"></i> <?php echo \JText::_('COM_PATCHTESTER_JISSUE'); ?>
+		</a>
+	</td>
+	<?php endif; ?>
+	<td class="text-center">
+		<?php if ($item->applied) : ?>
+            <span class="badge badge-success"><?php echo \JText::_('COM_PATCHTESTER_APPLIED'); ?></span>
+		<?php else : ?>
+			<span class="badge badge-secondary"><?php echo \JText::_('COM_PATCHTESTER_NOT_APPLIED'); ?></span>
+		<?php endif; ?>
+	</td>
+	<td class="text-center">
+		<?php if ($item->applied) : ?>
+			<a class="btn btn-sm btn-success" href="javascript:PatchTester.submitpatch('revert', '<?php echo (int) $item->applied; ?>');"><?php echo \JText::_('COM_PATCHTESTER_REVERT_PATCH'); ?></a><br />
+		<?php else : ?>
+			<a class="btn btn-sm btn-primary" href="javascript:PatchTester.submitpatch('apply', '<?php echo (int) $item->pull_id; ?>');"><?php echo \JText::_('COM_PATCHTESTER_APPLY_PATCH'); ?></a>
+		<?php endif; ?>
+	</td>
+</tr>
+<?php endforeach;
diff --git a/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.sys.ini b/administrator/templates/atum/language/en-GB/en-GB.tpl_atum.sys.ini
@@ -6,15 +6,11 @@
 ATUM="Atum Administrator template"
 TPL_ATUM_POSITION_BOTTOM="Bottom"
 TPL_ATUM_POSITION_CPANEL="Cpanel"
-TPL_ATUM_POSITION_CP_SHELL="Unused"
 TPL_ATUM_POSITION_DEBUG="Debug"
-TPL_ATUM_POSITION_FOOTER="Footer"
 TPL_ATUM_POSITION_ICON="Quick Icons"
 TPL_ATUM_POSITION_LOGIN="Login"
 TPL_ATUM_POSITION_MENU="Menu"
-TPL_ATUM_POSITION_POSTINSTALL="Postinstall"
 TPL_ATUM_POSITION_STATUS="Status"
-TPL_ATUM_POSITION_SUBMENU="Submenu"
 TPL_ATUM_POSITION_TITLE="Title"
 TPL_ATUM_POSITION_TOOLBAR="Toolbar"
 TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5, Hathor from 1.6, Isis from 3.0), Atum is the Joomla 4 administrator template based on Bootstrap 4."
diff --git a/administrator/templates/atum/scss/_variables.scss b/administrator/templates/atum/scss/_variables.scss
@@ -156,7 +156,7 @@ $list-group-bg:                    $white-offset;
 $custom-select-bg:                 $white-offset;
 
 // Modals
-$zindex-modal:					   1080;
+$zindex-modal:                     1080;
 $modal-header-height:              46px;
 
 // Badges
@@ -174,4 +174,7 @@ $quickicon-box-shadow-danger:      0 0 3px 0 theme-color("danger");
 $grid-gutter-width:                15px;
 
 // A11y
-$focus-highlight-color:              #39f;
+$focus-highlight-color:            #39f;
+
+// Breadcrumbs 
+$breadcrumb-bg:                    #fff;
diff --git a/administrator/templates/atum/scss/pages/_com_admin.scss b/administrator/templates/atum/scss/pages/_com_admin.scss
@@ -10,4 +10,3 @@
     }
   }
 }
-
diff --git a/administrator/templates/atum/templateDetails.xml b/administrator/templates/atum/templateDetails.xml
@@ -25,21 +25,20 @@
 		<folder>img</folder>
 		<folder>js</folder>
 		<folder>language</folder>
-		<folder>less</folder>
+		<folder>scss</folder>
 	</files>
 	<positions>
+		<!-- used directly in the template -->
+		<position>bottom</position>
+		<position>debug</position>
 		<position>menu</position>
-		<position>submenu</position>
-		<position>toolbar</position>
-		<position>title</position>
 		<position>status</position>
-		<position>icon</position>
-		<position>cp_shell</position>
+		<position>title</position>
+		<position>toolbar</position>
+		<!-- used directly in a component and included here so the position will appear in the list of available positions -->
 		<position>cpanel</position>
-		<position>bottom</position>
-		<position>footer</position>
+		<position>icon</position>
 		<position>login</position>
-		<position>debug</position>
 	</positions>
 	<languages folder="language">
 		<language tag="en-GB">en-GB/en-GB.tpl_atum.ini</language>

diff --git a/installation/template/css/template.css b/installation/template/css/template.css
@@ -3122,7 +3122,7 @@ input[type="button"].btn-block {
   padding: 0.75rem 1rem;
   margin-bottom: 1rem;
   list-style: none;
-  background-color: #e9ecef; }
+  background-color: #fff; }
 
 .breadcrumb-item + .breadcrumb-item {
   padding-left: 0.5rem; }

diff --git a/installation/template/css/template.min.css b/installation/template/css/template.min.css
diff --git a/nbproject/private/config.properties b/nbproject/private/config.properties
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
@@ -0,0 +1,5 @@
+copy.src.files=false
+copy.src.on.open=false
+copy.src.target=
+index.file=index.php
+url=http://localhost/joomla-fork/
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group>
+            <file>file:/D:/xampp/htdocs/joomla-fork/administrator/components/com_content/Helper/ContentHelper.php</file>
+            <file>file:/D:/xampp/htdocs/joomla-fork/administrator/templates/atum/scss/pages/_com_admin.scss</file>
+            <file>file:/D:/xampp/htdocs/joomla-fork/administrator/components/com_workflow/View/Workflows/HtmlView.php</file>
+            <file>file:/D:/xampp/htdocs/joomla-fork/administrator/components/com_workflow/access.xml</file>
+            <file>file:/D:/xampp/htdocs/joomla-fork/administrator/components/com_content/access.xml</file>
+        </group>
+    </open-files>
+</project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -0,0 +1,14 @@
+auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
+auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
+auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.sass_2e_configured=true
+auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=true
+auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/templates/atum/scss:/templates/atum/css
+include.path=${php.global.include.path}
+php.version=PHP_56
+source.encoding=UTF-8
+src.dir=.
+tags.asp=false
+tags.short=false
+web.root=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.php.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/php-project/1">
+            <name>joomla-fork</name>
+        </data>
+    </configuration>
+</project>