diff --git a/admin/config.xml b/admin/config.xml index 0600c33..c72d42e 100755 --- a/admin/config.xml +++ b/admin/config.xml @@ -93,21 +93,6 @@ - - - - - + + + + + - - - - - - - COM_FIREDRIVE - Giovanni Mansillo - Feb 2018 - (C) 2014 Giovanni Mansillo. All rights reserved. - GNU General Public License version 3 or later - http://www.firedrive.eu - 5.2.1 - - script.php - - - sql/install.mysql.utf8.sql - - - - - sql/uninstall.mysql.utf8.sql - - - - - sql/updates/mysql - - - - index.html - controllers - helpers - language - models - views - controller.php - firedrive.php - - - index.html - images - smartIcons - - - COM_FIREDRIVE_MENU - - - COM_FIREDRIVE_MENU_DOCUMENTS - - - COM_FIREDRIVE_MENU_CATEGORIES - - - - index.html - access.xml - config.xml - firedrive.php - controller.php - sql - uploads - language - views - tables - models - helpers - controllers - - - - - http://get.firedrive.eu/update.php - - - + + + COM_FIREDRIVE + Giovanni Mansillo + Feb 2018 + (C) 2014 Giovanni Mansillo. All rights reserved. + GNU General Public License version 3 or later + http://www.firedrive.eu + 5.2.2 + + script.php + + + sql/install.mysql.utf8.sql + + + + + sql/uninstall.mysql.utf8.sql + + + + + sql/updates/mysql + + + + index.html + controllers + helpers + language + models + views + controller.php + firedrive.php + + + index.html + css + images + smartIcons + + + COM_FIREDRIVE_MENU + + + COM_FIREDRIVE_MENU_DOCUMENTS + + + COM_FIREDRIVE_MENU_CATEGORIES + + + + index.html + access.xml + config.xml + firedrive.php + controller.php + sql + uploads + language + views + tables + models + helpers + controllers + + + + http://get.firedrive.eu/update/ + + diff --git a/media/css/firedrive.css b/media/css/firedrive.css new file mode 100644 index 0000000..f229b49 --- /dev/null +++ b/media/css/firedrive.css @@ -0,0 +1,117 @@ +#firedrive-category-table { + display: table; + width: 100%; + margin-bottom: 18px; + max-width: 100%; + background-color: transparent; + border-collapse: collapse; + border-spacing: 0; +} + +#firedrive-category-table tbody, #firedrive-category-table thead { + display: table-row-group; + vertical-align: middle; + border-color: inherit; +} + +#firedrive-category-table tr { + display: table-row; + vertical-align: middle; + border-color: inherit; +} + +#firedrive-category-table th, #firedrive-category-table td { + text-align: left; + display: table-cell; + vertical-align: middle; + padding: 8px; + line-height: 18px; + border-top: 1px solid #ddd; +} + +#firedrive-category-table th { + font-weight: normal; + padding: 14px 8px; +} + +#firedrive-category-table .col-icon { + width: 1%; +} + +#firedrive-category-table .col-icon img { + max-width: inherit; + min-width: 30px; +} + +#firedrive-category-table .col-title h3 { + font-weight: bold; + font-size: 1.1em; +} + +#firedrive-category-table .col-actions { + text-align: right; +} + +/* +Max width before this PARTICULAR table gets nasty +This query will take effect for any screen smaller than 760px +and also iPads specifically. +*/ +@media only screen and (max-width: 760px), +(min-device-width: 768px) and (max-device-width: 1024px) { + + /* Force table to not be like tables anymore */ + #firedrive-category-table, + #firedrive-category-table thead, + #firedrive-category-table tbody, + #firedrive-category-table th, + #firedrive-category-table td, + #firedrive-category-table tr { + display: block; + } + + #firedrive-category-table thead tr { + position: absolute; + top: -9999px; + left: -9999px; + } + + #firedrive-category-table tr { + border: 1px solid #ccc; + margin-bottom: 3px; + } + + #firedrive-category-table td { + /* Behave like a "row" */ + border: none; + border-bottom: 1px solid #eee; + position: relative; + padding-left: 50%; + vertical-align: top; + } + + #firedrive-category-table td:before { + /* Now like a table header */ + position: absolute; + /* Top/left values mimic padding */ + top: 6px; + left: 6px; + width: 45%; + padding-right: 10px; + white-space: nowrap; + } + + #firedrive-category-table .col-title h3 { + margin-top: 0; + margin-bottom: 0; + size: 1em; + } + + #firedrive-category-table .col-icon { + display: none; + } + + #firedrive-category-table .col-actions { + text-align: left; + } +} \ No newline at end of file diff --git a/site/firedrive.php b/site/firedrive.php index c784d76..e7a994d 100755 --- a/site/firedrive.php +++ b/site/firedrive.php @@ -11,7 +11,11 @@ JLoader::register('FiredriveHelperRoute', JPATH_COMPONENT . '/helpers/route.php'); JLoader::register('FiredriveHelper', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/firedrive.php'); -$input = JFactory::getApplication()->input; +$app = JFactory::getApplication(); +$session = JFactory::getSession(); +$input = $app->input; + +$session->set('fdkey', JText::_('COM_FIREDRIVE_CREDITS')); if ($input->get('view') === 'category' && $input->get('layout') === 'modal') { @@ -27,4 +31,4 @@ $controller = JControllerLegacy::getInstance('Firedrive'); $controller->execute(JFactory::getApplication()->input->get('task')); -$controller->redirect(); +$controller->redirect(); \ No newline at end of file diff --git a/site/language/en-GB/en-GB.com_firedrive.ini b/site/language/en-GB/en-GB.com_firedrive.ini index 85d6c56..a0b9a24 100755 --- a/site/language/en-GB/en-GB.com_firedrive.ini +++ b/site/language/en-GB/en-GB.com_firedrive.ini @@ -5,7 +5,7 @@ COM_FIREDRIVE_VISIBILITY_4_GROUP = "Selected groups" COM_FIREDRIVE_VISIBILITY_5_AUTHOR = "Author" [Messages] -COM_FIREDRIVE_CREDITS = "Powered by Firedrive" +COM_FIREDRIVE_CREDITS = "

Powered by Firedrive

" COM_FIREDRIVE_NO_DOCUMENTS = "No document found." COM_FIREDRIVE_ERROR_DOCUMENT_NOT_FOUND = "Document not found." COM_FIREDRIVE_NO_FILE_ERROR_MESSAGE = "You forgot to select a file or there was an issue during file upload." @@ -32,6 +32,10 @@ COM_FIREDRIVE_FILTER_SEARCH_DESC = "Search a document by its title" [Categories view] COM_FIREDRIVE_NUM_ITEMS = "Document count" +COM_FIREDRIVE_CATEGORIES_DOCUMENT_TITLE_LABEL = "Nome" +COM_FIREDRIVE_CATEGORIES_DOCUMENT_SIZE_LABEL = "Dimensione" +COM_FIREDRIVE_CATEGORIES_DOCUMENT_CREATION_LABEL = "Creazione" +COM_FIREDRIVE_CATEGORIES_DOCUMENT_LICENSE_LABEL = "Licenza" [Document view] COM_FIREDRIVE_DESCRIPTION_LABEL = "Description" diff --git a/site/language/it-IT/it-IT.com_firedrive.ini b/site/language/it-IT/it-IT.com_firedrive.ini index 2c481ae..7512341 100755 --- a/site/language/it-IT/it-IT.com_firedrive.ini +++ b/site/language/it-IT/it-IT.com_firedrive.ini @@ -5,7 +5,7 @@ COM_FIREDRIVE_VISIBILITY_4_GROUP = "Gruppi selezionati" COM_FIREDRIVE_VISIBILITY_5_AUTHOR = "Autore" [Messages] -COM_FIREDRIVE_CREDITS = "Realizzato con Firedrive" +COM_FIREDRIVE_CREDITS = "

Realizzato con Firedrive

" COM_FIREDRIVE_NO_DOCUMENTS = "Nessun documento trovato." COM_FIREDRIVE_ERROR_DOCUMENT_NOT_FOUND = "Documento non trovato." COM_FIREDRIVE_NO_FILE_ERROR_MESSAGE = "Hai dimenticato di selezionare un file o si è verificato un errore durante l'upload." @@ -32,6 +32,10 @@ COM_FIREDRIVE_FILTER_SEARCH_DESC = "Cerca un documento per il titolo" [Categories view] COM_FIREDRIVE_NUM_ITEMS = "Contatore documenti" +COM_FIREDRIVE_CATEGORIES_DOCUMENT_TITLE_LABEL = "Nome" +COM_FIREDRIVE_CATEGORIES_DOCUMENT_SIZE_LABEL = "Dimensione" +COM_FIREDRIVE_CATEGORIES_DOCUMENT_CREATION_LABEL = "Creazione" +COM_FIREDRIVE_CATEGORIES_DOCUMENT_LICENSE_LABEL = "Licenza" [Document view] COM_FIREDRIVE_DESCRIPTION_LABEL = "Descrizione" diff --git a/site/models/category.php b/site/models/category.php index 2ad9c2d..c0834f3 100644 --- a/site/models/category.php +++ b/site/models/category.php @@ -63,7 +63,6 @@ public function __construct($config = array()) 'title', 'a.title', 'state', 'a.state', 'ordering', 'a.ordering', - 'description', 'a.description', 'created', 'a.created', 'file_size', 'a.file_size', ); diff --git a/site/views/categories/tmpl/default.php b/site/views/categories/tmpl/default.php index 10c6684..5ad1e63 100644 --- a/site/views/categories/tmpl/default.php +++ b/site/views/categories/tmpl/default.php @@ -36,6 +36,6 @@ loadTemplate('items'); - echo JText::_('COM_FIREDRIVE_CREDITS'); + echo JFactory::getSession()->get('fdkey'); ?> diff --git a/site/views/category/tmpl/default.php b/site/views/category/tmpl/default.php index 2934d0e..9595bf3 100644 --- a/site/views/category/tmpl/default.php +++ b/site/views/category/tmpl/default.php @@ -11,4 +11,4 @@ $this->subtemplatename = 'items'; echo JLayoutHelper::render('joomla.content.category_default', $this); -echo JText::_('COM_FIREDRIVE_CREDITS'); +echo JFactory::getSession()->get('fdkey'); \ No newline at end of file diff --git a/site/views/category/tmpl/default.xml b/site/views/category/tmpl/default.xml index 65e7b64..d3fbe93 100644 --- a/site/views/category/tmpl/default.xml +++ b/site/views/category/tmpl/default.xml @@ -75,9 +75,6 @@ - @@ -162,12 +159,12 @@ + label="COM_FIREDRIVE_FIELD_CATEGORY_SHOW_FILTER_FIELD_LABEL" + description="COM_FIREDRIVE_FIELD_CATEGORY_SHOW_FILTER_FIELD_DESC"> @@ -177,12 +174,13 @@ + label="COM_FIREDRIVE_FIELD_CATEGORY_SHOW_LINK_ON_TITLE_IN_CATEGORY_LABEL" + description="COM_FIREDRIVE_FIELD_CATEGORY_SHOW_LINK_ON_TITLE_IN_CATEGORY_DESC" + > diff --git a/site/views/category/tmpl/default_items.php b/site/views/category/tmpl/default_items.php index de846c3..099fc24 100644 --- a/site/views/category/tmpl/default_items.php +++ b/site/views/category/tmpl/default_items.php @@ -8,7 +8,8 @@ defined('_JEXEC') or die; JHtml::_('behavior.core'); - +$document = JFactory::getDocument(); +$document->addStyleSheet(JUri::base() . 'media/com_firedrive/css/firedrive.css'); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); ?> @@ -96,117 +97,115 @@ function tableOrdering(order, dir, task) { }; -