Skip to content

[JUX2] [01] Moved actions (on hover) dropdown to status buttons #2163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from Oct 9, 2013
Merged

[JUX2] [01] Moved actions (on hover) dropdown to status buttons #2163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a9822c
Refactored to be in sync with master
Oct 7, 2013
de46a21
Added new file (forgotten in previous commit)
Oct 7, 2013
6b3890d
[JUX2] [01] Moved actions (on hover) dropdown to status buttons: Fixe…
beat Oct 8, 2013
1f708e8
Merge pull request #5 from beat/jux-actions-fix
Oct 8, 2013
b694d7c
Merge remote-tracking branch 'remotes/upstream/master' into jux-action
Oct 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 16 additions & 37 deletions administrator/components/com_banners/views/banners/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@

JHtml::_('bootstrap.tooltip');
JHtml::_('behavior.multiselect');
JHtml::_('dropdown.init');
JHtml::_('formbehavior.chosen', 'select');

$user = JFactory::getUser();
$userId = $user->get('id');
$listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction'));
$canOrder = $user->authorise('core.edit.state', 'com_banners.category');
$archived = $this->state->get('filter.published') == 2 ? true : false;
$trashed = $this->state->get('filter.published') == -2 ? true : false;
$archived = $this->state->get('filter.state') == 2 ? true : false;
$trashed = $this->state->get('filter.state') == -2 ? true : false;
$params = (isset($this->state->params)) ? $this->state->params : new JObject;
$saveOrder = $listOrder == 'ordering';
if ($saveOrder)
Expand Down Expand Up @@ -164,7 +163,20 @@
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
<div class="btn-group">
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
<?php
// Create dropdown items
$action = $archived ? 'unarchive' : 'archive';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'banners');

$action = $trashed ? 'untrash' : 'trash';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'banners');

// Render dropdown list
echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
?>
</div>
</td>
<td class="nowrap has-context">
<div class="pull-left">
Expand All @@ -181,39 +193,6 @@
<?php echo $this->escape($item->category_title); ?>
</div>
</div>
<div class="pull-left">
<?php
// Create dropdown items
JHtml::_('dropdown.edit', $item->id, 'banner.');
JHtml::_('dropdown.divider');
if ($item->state) :
JHtml::_('dropdown.unpublish', 'cb' . $i, 'banners.');
else :
JHtml::_('dropdown.publish', 'cb' . $i, 'banners.');
endif;

JHtml::_('dropdown.divider');

if ($archived) :
JHtml::_('dropdown.unarchive', 'cb' . $i, 'banners.');
else :
JHtml::_('dropdown.archive', 'cb' . $i, 'banners.');
endif;

if ($item->checked_out) :
JHtml::_('dropdown.checkin', 'cb' . $i, 'banners.');
endif;

if ($trashed) :
JHtml::_('dropdown.untrash', 'cb' . $i, 'banners.');
else :
JHtml::_('dropdown.trash', 'cb' . $i, 'banners.');
endif;

// render dropdown list
echo JHtml::_('dropdown.render');
?>
</div>
</td>
<td class="center hidden-phone">
<?php echo JHtml::_('banner.pinned', $item->sticky, $i, $canChange); ?>
Expand Down
53 changes: 16 additions & 37 deletions administrator/components/com_banners/views/clients/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@

JHtml::_('bootstrap.tooltip');
JHtml::_('behavior.multiselect');
JHtml::_('dropdown.init');
JHtml::_('formbehavior.chosen', 'select');

$user = JFactory::getUser();
$userId = $user->get('id');
$listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction'));
$params = (isset($this->state->params)) ? $this->state->params : new JObject;
$archived = $this->state->get('filter.published') == 2 ? true : false;
$trashed = $this->state->get('filter.published') == -2 ? true : false;
$archived = $this->state->get('filter.state') == 2 ? true : false;
$trashed = $this->state->get('filter.state') == -2 ? true : false;
$sortFields = $this->getSortFields();
?>
<script type="text/javascript">
Expand Down Expand Up @@ -127,7 +126,20 @@
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'clients.', $canChange);?>
<div class="btn-group">
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'clients.', $canChange);?>
<?php
// Create dropdown items
$action = $archived ? 'unarchive' : 'archive';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'clients');

$action = $trashed ? 'untrash' : 'trash';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'clients');

// Render dropdown list
echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
?>
</div>
</td>
<td class="nowrap has-context">
<div class="pull-left">
Expand All @@ -141,39 +153,6 @@
<?php echo $this->escape($item->name); ?>
<?php endif; ?>
</div>
<div class="pull-left">
<?php
// Create dropdown items
JHtml::_('dropdown.edit', $item->id, 'client.');
JHtml::_('dropdown.divider');
if ($item->state) :
JHtml::_('dropdown.unpublish', 'cb' . $i, 'clients.');
else :
JHtml::_('dropdown.publish', 'cb' . $i, 'clients.');
endif;

JHtml::_('dropdown.divider');

if ($archived) :
JHtml::_('dropdown.unarchive', 'cb' . $i, 'clients.');
else :
JHtml::_('dropdown.archive', 'cb' . $i, 'clients.');
endif;

if ($item->checked_out) :
JHtml::_('dropdown.checkin', 'cb' . $i, 'clients.');
endif;

if ($trashed) :
JHtml::_('dropdown.untrash', 'cb' . $i, 'clients.');
else :
JHtml::_('dropdown.trash', 'cb' . $i, 'clients.');
endif;

// render dropdown list
echo JHtml::_('dropdown.render');
?>
</div>
</td>
<td class="small hidden-phone">
<?php echo $item->contact;?>
Expand Down
55 changes: 14 additions & 41 deletions administrator/components/com_contact/views/contacts/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

JHtml::_('bootstrap.tooltip');
JHtml::_('behavior.multiselect');
JHtml::_('dropdown.init');
JHtml::_('formbehavior.chosen', 'select');

$app = JFactory::getApplication();
Expand Down Expand Up @@ -165,7 +164,20 @@
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
<div class="btn-group">
<?php echo JHtml::_('jgrid.published', $item->published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
<?php
// Create dropdown items
$action = $archived ? 'unarchive' : 'archive';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'contacts');

$action = $trashed ? 'untrash' : 'trash';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'contacts');

// Render dropdown list
echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
?>
</div>
</td>
<td class="nowrap has-context">
<div class="pull-left">
Expand All @@ -185,45 +197,6 @@
<?php echo $item->category_title; ?>
</div>
</div>
<div class="pull-left">
<?php
// Create dropdown items
JHtml::_('dropdown.edit', $item->id, 'contact.');
JHtml::_('dropdown.divider');
if ($item->published) :
JHtml::_('dropdown.unpublish', 'cb' . $i, 'contacts.');
else :
JHtml::_('dropdown.publish', 'cb' . $i, 'contacts.');
endif;

if ($item->featured) :
JHtml::_('dropdown.unfeatured', 'cb' . $i, 'contacts.');
else :
JHtml::_('dropdown.featured', 'cb' . $i, 'contacts.');
endif;

JHtml::_('dropdown.divider');

if ($archived) :
JHtml::_('dropdown.unarchive', 'cb' . $i, 'contacts.');
else :
JHtml::_('dropdown.archive', 'cb' . $i, 'contacts.');
endif;

if ($item->checked_out) :
JHtml::_('dropdown.checkin', 'cb' . $i, 'contacts.');
endif;

if ($trashed) :
JHtml::_('dropdown.untrash', 'cb' . $i, 'contacts.');
else :
JHtml::_('dropdown.trash', 'cb' . $i, 'contacts.');
endif;

// render dropdown list
echo JHtml::_('dropdown.render');
?>
</div>
</td>
<td align="small hidden-phone">
<?php if (!empty($item->linked_user)) : ?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_content/models/featured.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected function getListQuery($resolveFKs = true)
$this->getState(
'list.select',
'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid, a.state, a.access, a.created, a.hits,' .
'a.language, a.created_by_alias, a.publish_up, a.publish_down'
'a.featured, a.language, a.created_by_alias, a.publish_up, a.publish_down'
)
);
$query->from('#__content AS a');
Expand Down
51 changes: 11 additions & 40 deletions administrator/components/com_content/views/articles/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

JHtml::_('bootstrap.tooltip');
JHtml::_('behavior.multiselect');
JHtml::_('dropdown.init');
JHtml::_('formbehavior.chosen', 'select');

$app = JFactory::getApplication();
Expand Down Expand Up @@ -168,6 +167,17 @@
<div class="btn-group">
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
<?php echo JHtml::_('contentadministrator.featured', $item->featured, $i, $canChange); ?>
<?php
// Create dropdown items
$action = $archived ? 'unarchive' : 'archive';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'articles');

$action = $trashed ? 'untrash' : 'trash';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'articles');

// Render dropdown list
echo JHtml::_('actionsdropdown.render', $this->escape($item->title));
?>
</div>
</td>
<td class="nowrap has-context">
Expand All @@ -190,45 +200,6 @@
<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
</div>
</div>
<div class="pull-left">
<?php
// Create dropdown items
JHtml::_('dropdown.edit', $item->id, 'article.');
JHtml::_('dropdown.divider');
if ($item->state) :
JHtml::_('dropdown.unpublish', 'cb' . $i, 'articles.');
else :
JHtml::_('dropdown.publish', 'cb' . $i, 'articles.');
endif;

if ($item->featured) :
JHtml::_('dropdown.unfeatured', 'cb' . $i, 'articles.');
else :
JHtml::_('dropdown.featured', 'cb' . $i, 'articles.');
endif;

JHtml::_('dropdown.divider');

if ($archived) :
JHtml::_('dropdown.unarchive', 'cb' . $i, 'articles.');
else :
JHtml::_('dropdown.archive', 'cb' . $i, 'articles.');
endif;

if ($item->checked_out) :
JHtml::_('dropdown.checkin', 'cb' . $i, 'articles.');
endif;

if ($trashed) :
JHtml::_('dropdown.untrash', 'cb' . $i, 'articles.');
else :
JHtml::_('dropdown.trash', 'cb' . $i, 'articles.');
endif;

// Render dropdown list
echo JHtml::_('dropdown.render');
?>
</div>
</td>
<td class="small hidden-phone">
<?php echo $this->escape($item->access_level); ?>
Expand Down
48 changes: 14 additions & 34 deletions administrator/components/com_content/views/featured/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

JHtml::_('bootstrap.tooltip');
JHtml::_('behavior.multiselect');
JHtml::_('dropdown.init');
JHtml::_('formbehavior.chosen', 'select');

$user = JFactory::getUser();
Expand Down Expand Up @@ -109,7 +108,21 @@
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td class="center">
<div class="btn-group">
<?php echo JHtml::_('jgrid.published', $item->state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
<?php echo JHtml::_('contentadministrator.featured', $item->featured, $i, $canChange); ?>
<?php
// Create dropdown items
$action = $archived ? 'unarchive' : 'archive';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'newsfeeds');

$action = $trashed ? 'untrash' : 'trash';
JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'newsfeeds');

// Render dropdown list
echo JHtml::_('actionsdropdown.render', $this->escape($item->title));
?>
</div>
</td>
<td class="nowrap has-context">
<div class="pull-left">
Expand All @@ -131,39 +144,6 @@
<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
</div>
</div>
<div class="pull-left">
<?php
// Create dropdown items
JHtml::_('dropdown.edit', $item->id, 'article.', 'index.php?option=com_content&return=featured');
JHtml::_('dropdown.divider');
if ($item->state) :
JHtml::_('dropdown.unpublish', 'cb' . $i, 'articles.');
else :
JHtml::_('dropdown.publish', 'cb' . $i, 'articles.');
endif;

JHtml::_('dropdown.divider');

if ($archived) :
JHtml::_('dropdown.unarchive', 'cb' . $i, 'articles.');
else :
JHtml::_('dropdown.archive', 'cb' . $i, 'articles.');
endif;

if ($item->checked_out) :
JHtml::_('dropdown.checkin', 'cb' . $i, 'articles.');
endif;

if ($trashed) :
JHtml::_('dropdown.untrash', 'cb' . $i, 'articles.');
else :
JHtml::_('dropdown.trash', 'cb' . $i, 'articles.');
endif;

// Render dropdown list
echo JHtml::_('dropdown.render');
?>
</div>
</td>
<td class="order">
<?php if ($canChange) : ?>
Expand Down
Loading