User tests: Successful: Unsuccessful:
Labels |
Added:
?
|
@losedk i have just comment on CS. That is why Travis fail here:
FILE: ...la/joomla-cms/administrator/components/com_users/helpers/html/users.php
--------------------------------------------------------------------------------
FOUND 4 ERROR(S) AFFECTING 2 LINE(S)
--------------------------------------------------------------------------------
58 | ERROR | Concat operator must be preceeded by one space
58 | ERROR | Concat operator must be followed by one space
112 | ERROR | Concat operator must be preceeded by one space
112 | ERROR | Concat operator must be followed by one space
------------------------------------------------------------------------------
hehe you are quite fast
Did I do it right?
Looks good to me. Will test now.
Works great! Thanks @losedk
@dgt41 have you tested it?
Obviously without the data-toggle="buttons-radio"
Nice work around!
Based purely on the screenshot there appears to be a double line between
the first two icons
On 2 March 2015 at 21:36, Dimitris Grammatiko notifications@github.com
wrote:
@test https://github.com/test success
[image: screen shot 2015-03-02 at 11 35 56]
https://cloud.githubusercontent.com/assets/3889375/6451111/f3177f80-c134-11e4-801b-0b47867d96eb.png—
Reply to this email directly or view it on GitHub
#6264 (comment).
Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/
@brianteeman Yeah see it. It's because of the modal
<div id="userModal_471" tabindex="-1" class="modal hide fade">
I'm not quite sure how to fix that. @dgt41 any ideas?
Propper solution:
views/users/tmpl/default.php
<div class="btn-group">
<?php echo JHtml::_('users.filterNotes', $item->note_count, $item->id); ?>
<?php echo JHtml::_('users.notes', $item->note_count, $item->id); ?>
<?php echo JHtml::_('users.addNote', $item->id); ?>
<?php if ($item->requireReset == '1') : ?>
<span class="label label-warning"><?php echo JText::_('COM_USERS_PASSWORD_RESET_REQUIRED'); ?></span>
<?php endif; ?>
</div>
<?php echo JHtml::_('users.notesModal', $item->note_count, $item->id); ?>
administrator/components/com_users/helpers/html/users.php
Replace function notes with:
/**
* Displays a note icon.
*
* @param integer $count The number of notes for the user
* @param integer $userId The user ID
*
* @return string A link to a modal window with the user notes
*
* @since 2.5
*/
public static function notes($count, $userId)
{
if (empty($count))
{
return '';
}
$title = JText::plural('COM_USERS_N_USER_NOTES', $count);
return '<a href="#userModal_' . (int) $userId . '" id="modal-' . (int) $userId . '" data-toggle="modal" class="hasTooltip btn btn-mini" title="' . $title . '">'
. '<i class="icon-drawer-2"></i><span class="hidden-phone">' . $title . '</span></a>';
}
/**
* Renders the modal html.
*
* @param integer $count The number of notes for the user
* @param integer $userId The user ID
*
* @return null
*
* @since 3.4.1
*/
public static function notesModal($count, $userId)
{
if (empty($count))
{
return '';
}
$title = JText::plural('COM_USERS_N_USER_NOTES', $count);
echo JHtmlBootstrap::renderModal(
'userModal_' . (int) $userId, array(
'url' => JRoute::_('index.php?option=com_users&view=notes&tmpl=component&layout=modal&u_id=' . (int) $userId),
'title' => $title,
'width' => '800px',
'height' => '500px')
);
return null;
}
Category | ⇒ | Templates (admin) UI/UX |
Status | Pending | ⇒ | Ready to Commit |
Easy | No | ⇒ | Yes |
@test still successful. good work @losedk and @dgt41! -> RTC
Labels |
Added:
?
|
Just added a small tweak. Moved the below mentioned outside the btn-group
<?php if ($item->requireReset == '1') : ?>
<span class="label label-warning"><?php echo JText::_('COM_USERS_PASSWORD_RESET_REQUIRED'); ?></span>
<?php endif; ?>
I don't why this fails?
There was a bad update to one of the PEAR service provider packages in the last few days. We changed our code to not rely on it but branches without that change will fail until the provider fixes the issue.
All green again :)
just tested and it is still RTC here thanks!
Status | Ready to Commit | ⇒ | Closed |
Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2015-03-13 09:49:12 |
Merged. Thanks!
Labels |
Removed:
?
|
nice