diff --git a/administrator/components/com_contenthistory/views/history/tmpl/modal.php b/administrator/components/com_contenthistory/views/history/tmpl/modal.php index 45c1c0569a5fe..c642f5e1e48dc 100644 --- a/administrator/components/com_contenthistory/views/history/tmpl/modal.php +++ b/administrator/components/com_contenthistory/views/history/tmpl/modal.php @@ -11,7 +11,7 @@ JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); -JHtml::_('bootstrap.tooltip'); +JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom')); JHtml::_('behavior.multiselect'); JHtml::_('jquery.framework'); @@ -87,106 +87,104 @@ ); ?> -

-
- - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - - items as $item) : ?> - - - - - + + + + + + + + +
- - - - - - - - - - - -
- pagination->getListFooter(); ?> -
- version_id); ?> - - - save_date, 'Y-m-d H:i:s'); ?> - - sha1_hash == $hash) :?> -   - - - version_note); ?> - - keep_forever) : ?> - -   - - - - +
+ +
+ + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + items as $item) : ?> + + + - - - - - - -
+ + + + + + + + + + + +
+ pagination->getListFooter(); ?> +
+ version_id); ?> + + + save_date, 'Y-m-d H:i:s'); ?> - - - editor); ?> - - character_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?> -
-
- + sha1_hash == $hash) :?> +   + +
+ version_note); ?> + + keep_forever) : ?> + +   + + + + + + + + editor); ?> + + character_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?> +
+ -
- -
+ + + + diff --git a/administrator/templates/hathor/css/colour_blue.css b/administrator/templates/hathor/css/colour_blue.css index 3517a37764e39..ffcfd085b2911 100644 --- a/administrator/templates/hathor/css/colour_blue.css +++ b/administrator/templates/hathor/css/colour_blue.css @@ -860,6 +860,7 @@ table.adminlist { color: #2c2c2c; } table.adminlist.modal { + border-top: 1px solid #738498; border-right: 1px solid #738498; border-left: 1px solid #738498; } diff --git a/administrator/templates/hathor/css/colour_brown.css b/administrator/templates/hathor/css/colour_brown.css index 8f98d221f0316..035e851ac51f0 100644 --- a/administrator/templates/hathor/css/colour_brown.css +++ b/administrator/templates/hathor/css/colour_brown.css @@ -860,6 +860,7 @@ table.adminlist { color: #2c2c2c; } table.adminlist.modal { + border-top: 1px solid #000000; border-right: 1px solid #000000; border-left: 1px solid #000000; } diff --git a/administrator/templates/hathor/css/colour_standard.css b/administrator/templates/hathor/css/colour_standard.css index cf849953d8d32..8de3e874e3336 100644 --- a/administrator/templates/hathor/css/colour_standard.css +++ b/administrator/templates/hathor/css/colour_standard.css @@ -860,6 +860,7 @@ table.adminlist { color: #2c2c2c; } table.adminlist.modal { + border-top: 1px solid #c7c8b2; border-right: 1px solid #c7c8b2; border-left: 1px solid #c7c8b2; } diff --git a/administrator/templates/hathor/css/template.css b/administrator/templates/hathor/css/template.css index 54c20bc071bf0..d61e93cec17a9 100644 --- a/administrator/templates/hathor/css/template.css +++ b/administrator/templates/hathor/css/template.css @@ -158,6 +158,13 @@ body.modal-open { overflow: hidden; -ms-overflow-style: none; } +.modal-buttons { + padding: 15px 0px; +} +.modal-buttons button { + font-size: 1.2em; + line-height: 1.6em; +} @font-face { font-family: 'IcoMoon'; src: url('../../../../media/jui/fonts/IcoMoon.eot'); diff --git a/administrator/templates/hathor/html/com_contenthistory/history/modal.php b/administrator/templates/hathor/html/com_contenthistory/history/modal.php new file mode 100644 index 0000000000000..af3eb5eb64e61 --- /dev/null +++ b/administrator/templates/hathor/html/com_contenthistory/history/modal.php @@ -0,0 +1,187 @@ + 'bottom')); +JHtml::_('behavior.multiselect'); +JHtml::_('jquery.framework'); + +$input = JFactory::getApplication()->input; +$field = $input->getCmd('field'); +$function = 'jSelectContenthistory_' . $field; +$listOrder = $this->escape($this->state->get('list.ordering')); +$listDirn = $this->escape($this->state->get('list.direction')); +$message = addslashes(JText::_('COM_CONTENTHISTORY_BUTTON_SELECT_ONE')); +$compareMessage = addslashes(JText::_('COM_CONTENTHISTORY_BUTTON_SELECT_TWO')); +$deleteMessage = addslashes(JText::_('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')); +$aliasArray = explode('.', $this->state->type_alias); +$option = (end($aliasArray) == 'category') ? 'com_categories&extension=' . implode('.', array_slice($aliasArray, 0, count($aliasArray) - 1)) : $aliasArray[0]; +$filter = JFilterInput::getInstance(); +$task = $filter->clean(end($aliasArray)) . '.loadhistory'; +$loadUrl = JRoute::_('index.php?option=' . $filter->clean($option) . '&task=' . $task); +$deleteUrl = JRoute::_('index.php?option=com_contenthistory&task=history.delete'); +$hash = $this->state->get('sha1_hash'); +$formUrl = 'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id=' . $this->state->get('item_id') . '&type_id=' + . $this->state->get('type_id') . '&type_alias=' . $this->state->get('type_alias') . '&' . JSession::getFormToken() . '=1'; + +JFactory::getDocument()->addScriptDeclaration(" + (function ($){ + $(document).ready(function (){ + $('#toolbar-load').click(function() { + var ids = $('input[id*=\'cb\']:checked'); + if (ids.length == 1) { + // Add version item id to URL + var url = $('#toolbar-load').attr('data-url') + '&version_id=' + ids[0].value; + $('#content-url').attr('data-url', url); + if (window.parent) { + window.parent.location = url; + } + } else { + alert('" . $message . "'); + } + }); + + $('#toolbar-preview').click(function() { + var windowSizeArray = ['width=800, height=600, resizable=yes, scrollbars=yes']; + var ids = $('input[id*=\'cb\']:checked'); + if (ids.length == 1) { + // Add version item id to URL + var url = $('#toolbar-preview').attr('data-url') + '&version_id=' + ids[0].value; + $('#content-url').attr('data-url', url); + if (window.parent) { + window.open(url, '', windowSizeArray); + return false; + } + } else { + alert('" . $message . "'); + } + }); + + $('#toolbar-compare').click(function() { + var windowSizeArray = ['width=1000, height=600, resizable=yes, scrollbars=yes']; + var ids = $('input[id*=\'cb\']:checked'); + if (ids.length == 2) { + // Add version item ids to URL + var url = $('#toolbar-compare').attr('data-url') + '&id1=' + ids[0].value + '&id2=' + ids[1].value; + $('#content-url').attr('data-url', url); + if (window.parent) { + window.open(url, '', windowSizeArray); + return false; + } + } else { + alert('" . $compareMessage . "'); + } + }); + }); + })(jQuery); + " +); + +?> +
+

+
+ +
+ +
+ + + + + +
+ +
+ + + + + + + + + + + + + + + items as $item) : ?> + + + + + + + + + + + +
+ + + + + + + + + + + +
+ version_id); ?> + + + save_date, 'Y-m-d H:i:s'); ?> + + sha1_hash == $hash) :?> +   + + + version_note); ?> + + keep_forever) : ?> + +   + + + + + + + + editor); ?> + + character_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?> +
+ + pagination->getListFooter(); ?> + + + + + +
+
diff --git a/administrator/templates/hathor/less/colour_baseline.less b/administrator/templates/hathor/less/colour_baseline.less index bab0cfdab89cf..719eafb35e883 100644 --- a/administrator/templates/hathor/less/colour_baseline.less +++ b/administrator/templates/hathor/less/colour_baseline.less @@ -536,6 +536,7 @@ table.adminlist { } table.adminlist.modal { + border-top: 1px solid @mainBorder; border-right: 1px solid @mainBorder; border-left: 1px solid @mainBorder; } diff --git a/administrator/templates/hathor/less/modals.less b/administrator/templates/hathor/less/modals.less index 570bce65c1839..64f84116f42f4 100644 --- a/administrator/templates/hathor/less/modals.less +++ b/administrator/templates/hathor/less/modals.less @@ -96,4 +96,13 @@ div.modal { body.modal-open { overflow: hidden; -ms-overflow-style: none; -} \ No newline at end of file +} + +/* Buttons bar in modal iframe */ +.modal-buttons { + padding: 15px 0px; +} +.modal-buttons button { + font-size: 1.2em; + line-height: 1.6em; +}