From: Andrea Zagli Date: Sat, 12 Dec 2009 10:42:17 +0000 (+0100) Subject: Some adjustments. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=beff1c3e76d5db6bb3cfcfcd98ce4db1582fa1c3;p=joomla%2Fjmnogosearch Some adjustments. --- diff --git a/com_mnogosearch/admin/admin.mnogosearch.php b/com_mnogosearch/admin/admin.mnogosearch.php new file mode 100644 index 0000000..4c507a4 --- /dev/null +++ b/com_mnogosearch/admin/admin.mnogosearch.php @@ -0,0 +1,21 @@ +execute( JRequest::getCmd( 'task' ) ); +$controller->redirect(); diff --git a/com_mnogosearch/admin/mnogosearch.php b/com_mnogosearch/admin/mnogosearch.php deleted file mode 100644 index 4c507a4..0000000 --- a/com_mnogosearch/admin/mnogosearch.php +++ /dev/null @@ -1,21 +0,0 @@ -execute( JRequest::getCmd( 'task' ) ); -$controller->redirect(); diff --git a/com_mnogosearch/admin/search.php b/com_mnogosearch/admin/search.php deleted file mode 100644 index 4c507a4..0000000 --- a/com_mnogosearch/admin/search.php +++ /dev/null @@ -1,21 +0,0 @@ -execute( JRequest::getCmd( 'task' ) ); -$controller->redirect(); diff --git a/com_mnogosearch/admin/views/mnogosearch/index.html b/com_mnogosearch/admin/views/mnogosearch/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_mnogosearch/admin/views/mnogosearch/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_mnogosearch/admin/views/mnogosearch/tmpl/default.php b/com_mnogosearch/admin/views/mnogosearch/tmpl/default.php new file mode 100644 index 0000000..cb86877 --- /dev/null +++ b/com_mnogosearch/admin/views/mnogosearch/tmpl/default.php @@ -0,0 +1,89 @@ + + +

+ + + + + + +

+ : + + + +

+ : + enabled ? ''. JText::_( 'Enabled' ) .'' : ''. JText::_( 'Disabled' ) .'' ?> + +

+ showResults ) : ?> + + + + +

+ +

+ + + + + + + showResults ) : ?> + + + + + + + + + + + items); $i < $n; $i++) { + $row =& $this->items[$i]; + ?> + + + + + showResults ) : ?> + + + + + +

+ +	+ lists['order_Dir'], @$this->lists['order'] ); ?> +	+ lists['order_Dir'], @$this->lists['order'] ); ?> +	+ +
+ pageNav->getListFooter(); ?> +
+ pageNav->limitstart; ?> +	+ search_term, ENT_QUOTES, 'UTF-8'); ?> +	+ hits; ?> +	+ returns; ?> +

+ + + + + +

diff --git a/com_mnogosearch/admin/views/mnogosearch/tmpl/index.html b/com_mnogosearch/admin/views/mnogosearch/tmpl/index.html new file mode 100644 index 0000000..fa6d84e --- /dev/null +++ b/com_mnogosearch/admin/views/mnogosearch/tmpl/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/com_mnogosearch/admin/views/mnogosearch/view.php b/com_mnogosearch/admin/views/mnogosearch/view.php new file mode 100644 index 0000000..223b68b --- /dev/null +++ b/com_mnogosearch/admin/views/mnogosearch/view.php @@ -0,0 +1,63 @@ +setTitle(JText::_('Search Statistics')); + + $limit = $mainframe->getUserStateFromRequest( 'global.list.limit', 'limit', $mainframe->getCfg('list_limit'), 'int' ); + $limitstart = $mainframe->getUserStateFromRequest( 'com_mnogosearch.limitstart', 'limitstart', 0, 'int' ); + + $model = $this->getModel(); + $items = $model->getItems(); + $params = &JComponentHelper::getParams( 'com_mnogosearch' ); + $enabled = $params->get('enabled'); + JHTML::_('behavior.tooltip'); + jimport('joomla.html.pagination'); + $pageNav = new JPagination( count($items), $limitstart, $limit ); + + $showResults = JRequest::getInt('search_results'); + + $search = $mainframe->getUserStateFromRequest( 'com_mnosearch.search', 'search', '', 'string' ); + + $this->assignRef('items', $items); + $this->assignRef('enabled', $enabled); + $this->assignRef('pageNav', $pageNav); + $this->assignRef('search', $search ); + $this->assignRef('lists', $model->lists ); + + $this->assignRef('showResults', $showResults); + + parent::display($tpl); + } +} diff --git a/com_mnogosearch/admin/views/search/index.html b/com_mnogosearch/admin/views/search/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/admin/views/search/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/admin/views/search/tmpl/default.php b/com_mnogosearch/admin/views/search/tmpl/default.php deleted file mode 100644 index cb86877..0000000 --- a/com_mnogosearch/admin/views/search/tmpl/default.php +++ /dev/null @@ -1,89 +0,0 @@ - - -

- - - - - - -

- : - - - -

- : - enabled ? ''. JText::_( 'Enabled' ) .'' : ''. JText::_( 'Disabled' ) .'' ?> - -

- showResults ) : ?> - - - - -

- -

- - - - - - - showResults ) : ?> - - - - - - - - - - - items); $i < $n; $i++) { - $row =& $this->items[$i]; - ?> - - - - - showResults ) : ?> - - - - - -

- -	- lists['order_Dir'], @$this->lists['order'] ); ?> -	- lists['order_Dir'], @$this->lists['order'] ); ?> -	- -
- pageNav->getListFooter(); ?> -
- pageNav->limitstart; ?> -	- search_term, ENT_QUOTES, 'UTF-8'); ?> -	- hits; ?> -	- returns; ?> -

- - - - - -

diff --git a/com_mnogosearch/admin/views/search/tmpl/index.html b/com_mnogosearch/admin/views/search/tmpl/index.html deleted file mode 100644 index fa6d84e..0000000 --- a/com_mnogosearch/admin/views/search/tmpl/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/com_mnogosearch/admin/views/search/view.php b/com_mnogosearch/admin/views/search/view.php deleted file mode 100644 index 223b68b..0000000 --- a/com_mnogosearch/admin/views/search/view.php +++ /dev/null @@ -1,63 +0,0 @@ -setTitle(JText::_('Search Statistics')); - - $limit = $mainframe->getUserStateFromRequest( 'global.list.limit', 'limit', $mainframe->getCfg('list_limit'), 'int' ); - $limitstart = $mainframe->getUserStateFromRequest( 'com_mnogosearch.limitstart', 'limitstart', 0, 'int' ); - - $model = $this->getModel(); - $items = $model->getItems(); - $params = &JComponentHelper::getParams( 'com_mnogosearch' ); - $enabled = $params->get('enabled'); - JHTML::_('behavior.tooltip'); - jimport('joomla.html.pagination'); - $pageNav = new JPagination( count($items), $limitstart, $limit ); - - $showResults = JRequest::getInt('search_results'); - - $search = $mainframe->getUserStateFromRequest( 'com_mnosearch.search', 'search', '', 'string' ); - - $this->assignRef('items', $items); - $this->assignRef('enabled', $enabled); - $this->assignRef('pageNav', $pageNav); - $this->assignRef('search', $search ); - $this->assignRef('lists', $model->lists ); - - $this->assignRef('showResults', $showResults); - - parent::display($tpl); - } -} diff --git a/com_mnogosearch/mnogosearch.xml b/com_mnogosearch/mnogosearch.xml index 54ee475..0c80ef7 100644 --- a/com_mnogosearch/mnogosearch.xml +++ b/com_mnogosearch/mnogosearch.xml @@ -5,7 +5,7 @@ Andrea Zagli December 2009 Copyright (C) 2009 Andrea Zagli. All rights reserved. - http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL + http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL azagli@libero.it http://saetta.homelinux.org/ 1.0.0 @@ -29,7 +29,24 @@ jmnoGoSearch - + admin.mnogosearch.php + config.xml + controller.php + index.html + helpers/index.html + helpers/mnogosearch.php + helpers/site.php + models/index.html + models/mnogosearch.php + sql/index.html + sql/indstall.sql + sql/uninstall.sql + helpers/index.html + views/index.html + views/mnogosearch/index.html + views/mnogosearch/view.php + views/mnogosearch/tmpl/index.html + views/mnogosearch/tmpl/default.php diff --git a/mod_mnogosearch/mod_mnogosearch.xml b/mod_mnogosearch/mod_mnogosearch.xml index 6e8e479..a2afd23 100644 --- a/mod_mnogosearch/mod_mnogosearch.xml +++ b/mod_mnogosearch/mod_mnogosearch.xml @@ -4,14 +4,16 @@ Andrea Zagli December 2009 Copyright (C) 2000 Andrea Zagli. All rights reserved. - http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL + http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL azagli@libero.it http://saetta.homelinux.org/ 1.0.0 This module will display a search box that is linked with the mnoGoSearch web search engine. + mod_mnogosearch.php +