Skip to content

Commit

Permalink
Merge pull request joomla#82 from elinw/beez-t8
Browse files Browse the repository at this point in the history
Some changes to make transitioning to the new outputs easier
  • Loading branch information
mbabker committed Aug 6, 2012
2 parents 4c82670 + 817bfea commit 1dd389f
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 5 deletions.
2 changes: 1 addition & 1 deletion components/com_content/helpers/icon.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static function edit($article, $params, $attribs = array())
$overlib .= JText::sprintf('COM_CONTENT_WRITTEN_BY', htmlspecialchars($author, ENT_COMPAT, 'UTF-8'));

$icon = $article->state ? 'edit' : 'eye-close';
$text = '<i class="icon-'.$icon.' tip" title="'.JText::_('COM_CONTENT_EDIT_ITEM').' :: '.$overlib.'"></i> '.JText::_('JGLOBAL_EDIT');
$text = '<i class="hasTip icon-'.$icon.' tip" title="'.JText::_('COM_CONTENT_EDIT_ITEM').' :: '.$overlib.'"></i> '.JText::_('JGLOBAL_EDIT') ;

$output = JHtml::_('link', JRoute::_($url), $text);

Expand Down
3 changes: 2 additions & 1 deletion components/com_content/views/article/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
}
if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
<div class="btn-group pull-right"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <i class="icon-cog"></i> <span class="caret"></span> </a>
<ul class="dropdown-menu">
<?php // Note the actions class is deprecated. Use dropdown-menu instead. ?>
<ul class="dropdown-menu actions">
<?php if (!$this->print) : ?>
<?php if ($params->get('show_print_icon')) : ?>
<li class="print-icon"> <?php echo JHtml::_('icon.print_popup', $this->item, $params); ?> </li>
Expand Down
4 changes: 2 additions & 2 deletions modules/mod_menu/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

// Note. It is important to remove spaces between elements.
?>

<ul class="nav <?php echo $class_sfx;?>"<?php
<?php // The menu class is deprecated. Use nav instead. ?>
<ul class="nav menu <?php echo $class_sfx;?>"<?php
$tag = '';
if ($params->get('tag_id')!= null)
{
Expand Down
3 changes: 2 additions & 1 deletion plugins/content/pagenavigation/pagenavigation.php
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,9 @@ public function onContentBeforeDisplay($context, &$row, &$params, $page=0)

// Output.
if ($row->prev || $row->next) {
// Note: The pagenav class is deprecated. Use pager instead.
$html = '
<ul class="pager">';
<ul class="pager pagenav">';
if ($row->prev) {
$html .= '
<li class="previous">
Expand Down
46 changes: 46 additions & 0 deletions templates/beez5/html/mod_breadcrumbs/default.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php
/**
* @package Joomla.Site
* @subpackage mod_breadcrumbs
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

defined('_JEXEC') or die;
?>

<div class="breadcrumbs<?php echo $moduleclass_sfx; ?>">
<?php if ($params->get('showHere', 1))
{
echo '<span class="showHere">' .JText::_('MOD_BREADCRUMBS_HERE').'</span>';
}
?>
<?php for ($i = 0; $i < $count; $i ++) :
// Workaround for duplicate Home when using multilanguage
if ($i == 1 && !empty($list[$i]->link) && !empty($list[$i-1]->link) && $list[$i]->link == $list[$i-1]->link) {
continue;
}
// If not the last item in the breadcrumbs add the separator
if ($i < $count -1) {
if (!empty($list[$i]->link)) {
echo '<a href="'.$list[$i]->link.'" class="pathway">'.$list[$i]->name.'</a>';
} else {
echo '<span>';
echo $list[$i]->name;
echo '</span>';
}
if($i < $count -2){
echo ' '.$separator.' ';
}
} elseif ($params->get('showLast', 1)) { // when $i == $count -1 and 'showLast' is true
if ($i > 0)
{
echo ' '.$separator.' ';
}
echo '<span>';
echo $list[$i]->name;
echo '</span>';
}
endfor; ?>
</div>
1 change: 1 addition & 0 deletions templates/beez5/html/mod_breadcrumbs/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!DOCTYPE html><title></title>
46 changes: 46 additions & 0 deletions templates/beez_20/html/mod_breadcrumbs/default.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php
/**
* @package Joomla.Site
* @subpackage mod_breadcrumbs
*
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

defined('_JEXEC') or die;
?>

<div class="breadcrumbs<?php echo $moduleclass_sfx; ?>">
<?php if ($params->get('showHere', 1))
{
echo '<span class="showHere">' .JText::_('MOD_BREADCRUMBS_HERE').'</span>';
}
?>
<?php for ($i = 0; $i < $count; $i ++) :
// Workaround for duplicate Home when using multilanguage
if ($i == 1 && !empty($list[$i]->link) && !empty($list[$i-1]->link) && $list[$i]->link == $list[$i-1]->link) {
continue;
}
// If not the last item in the breadcrumbs add the separator
if ($i < $count -1) {
if (!empty($list[$i]->link)) {
echo '<a href="'.$list[$i]->link.'" class="pathway">'.$list[$i]->name.'</a>';
} else {
echo '<span>';
echo $list[$i]->name;
echo '</span>';
}
if($i < $count -2){
echo ' '.$separator.' ';
}
} elseif ($params->get('showLast', 1)) { // when $i == $count -1 and 'showLast' is true
if ($i > 0)
{
echo ' '.$separator.' ';
}
echo '<span>';
echo $list[$i]->name;
echo '</span>';
}
endfor; ?>
</div>
1 change: 1 addition & 0 deletions templates/beez_20/html/mod_breadcrumbs/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!DOCTYPE html><title></title>

0 comments on commit 1dd389f

Please sign in to comment.