30
1
mirror of https://github.com/joomla-extensions/weblinks.git synced 2024-09-27 20:49:05 +00:00

Merge branch 'packagebuilding'

This commit is contained in:
Yves Hoppe 2015-11-01 14:29:46 +01:00
commit 5e9b7211b2
89 changed files with 710 additions and 213 deletions

5
.gitignore vendored
View File

@ -57,3 +57,8 @@ selenium-server-standalone.jar
codecept.phar
selenium.log
tests/cache
# Package building related
/dist
jbuild.ini

View File

@ -36,5 +36,8 @@ before_script:
- composer install
script:
# Build
- mv jbuild.dist.ini jbuild.ini
- vendor/bin/robo build
- mv tests/acceptance.suite.dist.yml tests/acceptance.suite.yml
- vendor/bin/robo run:tests true

View File

@ -2,6 +2,13 @@
This repo is meant to hold the decoupled com_weblinks component and related code.
# Building
```bash
$ composer install
$ vendor/bin/robo build
```
# Tests
To prepare the system tests (Selenium) to be run in your local machine you are asked to rename the file `tests/acceptance.suite.dist.yml` to `tests/acceptance.suite.yml`. Afterwards, please edit the file according to your system needs.

View File

@ -10,10 +10,16 @@
require_once 'vendor/autoload.php';
if (!defined('JPATH_BASE'))
{
define('JPATH_BASE', __DIR__);
}
class RoboFile extends \Robo\Tasks
{
// Load tasks from composer, see composer.json
use \joomla_projects\robo\loadTasks;
use \JBuild\Tasks\loadTasks;
private $extension = '';
@ -236,6 +242,14 @@ class RoboFile extends \Robo\Tasks
$this->_exec('chown -R ' . $this->configuration->localUser . ' ' . $this->cmsPath);
}
// Copy current package
if (!file_exists('dist/pkg-weblinks-current.zip'))
{
$this->build(true);
}
$this->_copy('dist/pkg-weblinks-current.zip', $this->cmsPath . "/pkg-weblinks-current.zip");
$this->say('Joomla CMS site created at ' . $this->cmsPath);
// Optionally uses Joomla default htaccess file. Used by TravisCI
@ -392,4 +406,21 @@ class RoboFile extends \Robo\Tasks
{
$this->_exec('phpcpd' . $this->extension . ' ' . __DIR__ . '/src');
}
/**
* Build the joomla extension package
*
* @param array $params Additional params
*
* @return void
*/
public function build($params = ['dev' => false])
{
if (!file_exists('jbuild.ini'))
{
$this->_copy('jbuild.dist.ini', 'jbuild.ini');
}
$this->taskBuild($params)->run();
}
}

View File

@ -11,6 +11,7 @@
"codegyre/robo": "~0.5",
"joomla-projects/robo": "dev-master",
"joomla-projects/selenium-server-standalone": "v2.47.1",
"fzaninotto/faker": "^1.5"
"fzaninotto/faker": "^1.5",
"joomla-projects/jorobo": "dev-master"
}
}

471
composer.lock generated
View File

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "a92f2be1ccb2397e6cc71bcb0287cff5",
"content-hash": "48d3e6cb6a82e49be6cf95b54abd5364",
"hash": "a8a7b0841ddc3e3a0bd3342685dec2c7",
"content-hash": "6960f421ca42c77ad244335fb8fb3ee3",
"packages": [],
"packages-dev": [
{
@ -90,16 +90,16 @@
},
{
"name": "codegyre/robo",
"version": "0.6.0",
"version": "0.5.4",
"source": {
"type": "git",
"url": "https://github.com/Codegyre/Robo.git",
"reference": "d18185f0494c854d36aa5ee0ad931ee23bbef552"
"reference": "10aa223f6d1db182dc81d723bf1545dfc6ff380d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Codegyre/Robo/zipball/d18185f0494c854d36aa5ee0ad931ee23bbef552",
"reference": "d18185f0494c854d36aa5ee0ad931ee23bbef552",
"url": "https://api.github.com/repos/Codegyre/Robo/zipball/10aa223f6d1db182dc81d723bf1545dfc6ff380d",
"reference": "10aa223f6d1db182dc81d723bf1545dfc6ff380d",
"shasum": ""
},
"require": {
@ -113,7 +113,6 @@
"require-dev": {
"codeception/aspect-mock": "0.5.*",
"codeception/base": "~2.1",
"codeception/codeception": "2.1",
"codeception/verify": "0.2.*",
"natxet/cssmin": "~3.0",
"patchwork/jsqueeze": "~1.0"
@ -138,7 +137,7 @@
}
],
"description": "Modern task runner",
"time": "2015-10-30 11:29:52"
"time": "2015-08-31 17:35:30"
},
{
"name": "doctrine/instantiator",
@ -289,6 +288,39 @@
],
"time": "2015-05-29 06:29:14"
},
{
"name": "greencape/joomla-cs",
"version": "0.2.0",
"source": {
"type": "git",
"url": "https://github.com/GreenCape/coding-standards.git",
"reference": "8d7c65416c2494063d55c3be66ea317fa9d8ef32"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/GreenCape/coding-standards/zipball/8d7c65416c2494063d55c3be66ea317fa9d8ef32",
"reference": "8d7c65416c2494063d55c3be66ea317fa9d8ef32",
"shasum": ""
},
"require": {
"squizlabs/php_codesniffer": "~1.5"
},
"type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Niels Braczek",
"email": "nbraczek@bsds.de",
"role": "lead"
}
],
"description": "Composer installable Coding Standards Definition.",
"homepage": "https://github.com/GreenCape/coding-standards",
"time": "2015-07-03 12:01:28"
},
{
"name": "guzzlehttp/guzzle",
"version": "6.1.0",
@ -527,12 +559,12 @@
"source": {
"type": "git",
"url": "https://github.com/joomla-projects/joomla-browser.git",
"reference": "b0056ff0018c529cc2a143f6d78004bce8f9d5b0"
"reference": "e3c0462b76b960639835ffad5b42b744522b7ac6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/b0056ff0018c529cc2a143f6d78004bce8f9d5b0",
"reference": "b0056ff0018c529cc2a143f6d78004bce8f9d5b0",
"url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/e3c0462b76b960639835ffad5b42b744522b7ac6",
"reference": "e3c0462b76b960639835ffad5b42b744522b7ac6",
"shasum": ""
},
"require": {
@ -570,7 +602,59 @@
"acceptance testing",
"joomla"
],
"time": "2015-10-31 11:00:18"
"time": "2015-11-01 10:09:29"
},
{
"name": "joomla-projects/jorobo",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/joomla-projects/jorobo.git",
"reference": "61ab3dd576bbcc6e48a31eeb0364a5d37caa59ec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-projects/jorobo/zipball/61ab3dd576bbcc6e48a31eeb0364a5d37caa59ec",
"reference": "61ab3dd576bbcc6e48a31eeb0364a5d37caa59ec",
"shasum": ""
},
"require": {
"codegyre/robo": "0.5.*",
"greencape/joomla-cs": "~0.2",
"joomla-projects/robo": "dev-master",
"joomla/github": "~1.3",
"php": ">=5.4.0"
},
"require-dev": {
"codeception/aspect-mock": "~0.5",
"codeception/base": "~2.1"
},
"type": "library",
"autoload": {
"psr-4": {
"JBuild\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"authors": [
{
"name": "Yves Hoppe",
"email": "yves@compojoom.com"
},
{
"name": "Niels Nübel",
"email": "info@nn-medienagentur.de"
},
{
"name": "Niels Braczek",
"email": "nbraczek@bsds.de"
}
],
"description": "Tool and Task based on Robo.li to manage Joomla Extension Development and Releases",
"time": "2015-11-01 12:52:30"
},
{
"name": "joomla-projects/robo",
@ -649,6 +733,366 @@
],
"time": "2015-09-30 10:26:45"
},
{
"name": "joomla/compat",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/compat.git",
"reference": "f23565fe0184517778996226eb4b2333deb369c4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/compat/zipball/f23565fe0184517778996226eb4b2333deb369c4",
"reference": "f23565fe0184517778996226eb4b2333deb369c4",
"shasum": ""
},
"require": {
"php": ">=5.3.10"
},
"type": "joomla-package",
"autoload": {
"classmap": [
"src/JsonSerializable.php",
"src/CallbackFilterIterator.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Compat Package",
"homepage": "https://github.com/joomla-framework/compat",
"keywords": [
"compat",
"framework",
"joomla"
],
"time": "2015-02-24 00:21:06"
},
{
"name": "joomla/date",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/date.git",
"reference": "b985dc1a4ed41ea14c90fc09347c6bb44470aeaa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/date/zipball/b985dc1a4ed41ea14c90fc09347c6bb44470aeaa",
"reference": "b985dc1a4ed41ea14c90fc09347c6bb44470aeaa",
"shasum": ""
},
"require": {
"php": ">=5.3.10"
},
"type": "joomla-package",
"autoload": {
"psr-4": {
"Joomla\\Date\\": "src/",
"Joomla\\Date\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Date Package",
"homepage": "https://github.com/joomla-framework/date",
"keywords": [
"date",
"framework",
"joomla"
],
"time": "2014-02-09 01:27:57"
},
{
"name": "joomla/github",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/github-api.git",
"reference": "39b4ad1221ce7d87b63c49a35df948b55b20d9c3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/github-api/zipball/39b4ad1221ce7d87b63c49a35df948b55b20d9c3",
"reference": "39b4ad1221ce7d87b63c49a35df948b55b20d9c3",
"shasum": ""
},
"require": {
"joomla/date": "~1.0",
"joomla/http": "~1.0",
"joomla/registry": "~1.0",
"joomla/uri": "~1.0",
"php": ">=5.3.10"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*"
},
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Joomla\\Github\\": "src/",
"Joomla\\Github\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Github Package",
"homepage": "https://github.com/joomla-framework/github-api",
"keywords": [
"framework",
"github",
"joomla"
],
"time": "2015-02-03 12:13:36"
},
{
"name": "joomla/http",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/http.git",
"reference": "09f5ba9d1e3003e53f0b32d12e87fcf860b8c552"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/http/zipball/09f5ba9d1e3003e53f0b32d12e87fcf860b8c552",
"reference": "09f5ba9d1e3003e53f0b32d12e87fcf860b8c552",
"shasum": ""
},
"require": {
"joomla/uri": "~1.0",
"php": ">=5.3.10"
},
"require-dev": {
"joomla/test": "~1.0",
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {
"joomla/registry": "Registry can be used as an alternative to using an array for the package options."
},
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Joomla\\Http\\": "src/",
"Joomla\\Http\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla HTTP Package",
"homepage": "https://github.com/joomla-framework/http",
"keywords": [
"framework",
"http",
"joomla"
],
"time": "2015-09-19 17:57:40"
},
{
"name": "joomla/registry",
"version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/registry.git",
"reference": "db55cf426bd27524557affbe95b18d6a2f959657"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/registry/zipball/db55cf426bd27524557affbe95b18d6a2f959657",
"reference": "db55cf426bd27524557affbe95b18d6a2f959657",
"shasum": ""
},
"require": {
"joomla/compat": "~1.0",
"joomla/string": "~1.3",
"joomla/utilities": "~1.0",
"php": ">=5.3.10"
},
"require-dev": {
"joomla/test": "~1.0",
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*",
"symfony/yaml": "~2.0"
},
"suggest": {
"symfony/yaml": "Install 2.* if you require YAML support."
},
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Joomla\\Registry\\": "src/",
"Joomla\\Registry\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Registry Package",
"homepage": "https://github.com/joomla-framework/registry",
"keywords": [
"framework",
"joomla",
"registry"
],
"time": "2015-10-14 17:01:46"
},
{
"name": "joomla/string",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/string.git",
"reference": "1a61294f887a95ec3eb2e4dac12ba18ab6b2bf5a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/string/zipball/1a61294f887a95ec3eb2e4dac12ba18ab6b2bf5a",
"reference": "1a61294f887a95ec3eb2e4dac12ba18ab6b2bf5a",
"shasum": ""
},
"require": {
"php": ">=5.3.10"
},
"require-dev": {
"joomla/test": "~1.0",
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*"
},
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Joomla\\String\\": "src/",
"Joomla\\String\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla String Package",
"homepage": "https://github.com/joomla-framework/string",
"keywords": [
"framework",
"joomla",
"string"
],
"time": "2015-05-03 16:08:20"
},
{
"name": "joomla/uri",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/uri.git",
"reference": "980e532e4235bb8f1ada15b28822abbeb171da3f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/uri/zipball/980e532e4235bb8f1ada15b28822abbeb171da3f",
"reference": "980e532e4235bb8f1ada15b28822abbeb171da3f",
"shasum": ""
},
"require": {
"php": ">=5.3.10"
},
"type": "joomla-package",
"autoload": {
"psr-4": {
"Joomla\\Uri\\": "src/",
"Joomla\\Uri\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Uri Package",
"homepage": "https://github.com/joomla-framework/uri",
"keywords": [
"framework",
"joomla",
"uri"
],
"time": "2014-02-09 02:57:17"
},
{
"name": "joomla/utilities",
"version": "1.3.3",
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/utilities.git",
"reference": "3e43b0806c194a92b58a176b73d6cc2dc6c9c3a4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/utilities/zipball/3e43b0806c194a92b58a176b73d6cc2dc6c9c3a4",
"reference": "3e43b0806c194a92b58a176b73d6cc2dc6c9c3a4",
"shasum": ""
},
"require": {
"joomla/string": "~1.3",
"php": ">=5.3.10"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"squizlabs/php_codesniffer": "1.*"
},
"type": "joomla-package",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Joomla\\Utilities\\": "src/",
"Joomla\\Utilities\\Tests\\": "Tests/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Joomla Utilities Package",
"homepage": "https://github.com/joomla-framework/utilities",
"keywords": [
"framework",
"joomla",
"utilities"
],
"time": "2015-03-28 17:52:43"
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "2.0.4",
@ -2126,7 +2570,8 @@
"minimum-stability": "stable",
"stability-flags": {
"joomla-projects/joomla-browser": 20,
"joomla-projects/robo": 20
"joomla-projects/robo": 20,
"joomla-projects/jorobo": 20
},
"prefer-stable": false,
"prefer-lowest": false,

5
docs/README.md Normal file
View File

@ -0,0 +1,5 @@
How to install
Just install the package file over the normal Joomla! installer
You can also only install certain parts by unzipping the package before.

4
jbuild.dist.ini Normal file
View File

@ -0,0 +1,4 @@
extension = weblinks
version = 3.4.3
source = src
target = package

View File

@ -2,12 +2,12 @@
<extension type="component" version="3.1" method="upgrade">
<name>com_weblinks</name>
<author>Joomla! Project</author>
<creationDate>April 2006</creationDate>
<copyright>(C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
<creationDate>##DATE##</creationDate>
<copyright>(C) 2005 - ##YEAR## Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<version>3.4.1</version>
<version>##VERSION##</version>
<description>COM_WEBLINKS_XML_DESCRIPTION</description>
<scriptfile>script.php</scriptfile>
@ -33,17 +33,12 @@
</schemas>
</update>
<files folder="site">
<filename>weblinks.php</filename>
<filename>controller.php</filename>
<filename>router.php</filename>
<filename>metadata.xml</filename>
<folder>views</folder>
<folder>models</folder>
<folder>controllers</folder>
<folder>helpers</folder>
<folder>language</folder>
<files folder="components/com_weblinks">
##FRONTEND_COMPONENT_FILES##
</files>
<languages folder="language">
##FRONTEND_LANGUAGE_FILES##
</languages>
<administration>
<menu img="class:weblinks">com_weblinks</menu>
<submenu>
@ -56,19 +51,12 @@
<menu link="option=com_categories&amp;extension=com_weblinks"
view="categories" img="class:weblinks-cat" alt="Weblinks/Categories">com_weblinks_categories</menu>
</submenu>
<files folder="admin">
<filename>access.xml</filename>
<filename>config.xml</filename>
<filename>controller.php</filename>
<filename>weblinks.php</filename>
<folder>controllers</folder>
<folder>helpers</folder>
<folder>language</folder>
<folder>models</folder>
<folder>sql</folder>
<folder>tables</folder>
<folder>views</folder>
<files folder="administrator/components/com_weblinks">
##BACKEND_COMPONENT_FILES##
</files>
<languages folder="administrator/language">
##BACKEND_LANGUAGE_FILES##
</languages>
</administration>
</extension>

View File

@ -1,162 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="module" version="3.1" client="site" method="upgrade">
<name>mod_weblinks</name>
<author>Joomla! Project</author>
<creationDate>July 2009</creationDate>
<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<version>3.4.1</version>
<description>MOD_WEBLINKS_XML_DESCRIPTION</description>
<files>
<folder>language</folder>
<folder>tmpl</folder>
<filename module="mod_weblinks">mod_weblinks.php</filename>
<filename>helper.php</filename>
</files>
<help key="JHELP_EXTENSIONS_MODULE_MANAGER_WEBLINKS" />
<config>
<fields name="params">
<fieldset name="basic">
<field
name="catid"
type="category"
extension="com_weblinks"
required="true"
label="JCATEGORY"
description="MOD_WEBLINKS_FIELD_CATEGORY_DESC" />
<field
name="count"
type="text"
default="5"
label="MOD_WEBLINKS_FIELD_COUNT_LABEL"
description="MOD_WEBLINKS_FIELD_COUNT_DESC" />
<field
name="ordering"
type="list"
default="title"
label="MOD_WEBLINKS_FIELD_ORDERING_LABEL"
description="MOD_WEBLINKS_FIELD_ORDERING_DESC">
<option
value="title">JGLOBAL_TITLE</option>
<option
value="order">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
<option
value="hits">MOD_WEBLINKS_FIELD_VALUE_HITS</option>
</field>
<field
name="direction"
type="list"
default="asc"
label="MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL"
description="MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC">
<option
value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
<option
value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
</field>
<field
name="target"
type="list"
default="3"
label="MOD_WEBLINKS_FIELD_TARGET_LABEL"
description="MOD_WEBLINKS_FIELD_TARGET_DESC">
<option
value="1">JBROWSERTARGET_NEW</option>
<option
value="2">JBROWSERTARGET_POPUP</option>
<option
value="3">JBROWSERTARGET_PARENT</option>
</field>
<field
name="follow"
type="list"
default="0"
label="MOD_WEBLINKS_FIELD_FOLLOW_LABEL"
description="MOD_WEBLINKS_FIELD_FOLLOW_DESC">
<option
value="follow">MOD_WEBLINKS_FIELD_VALUE_FOLLOW</option>
<option
value="nofollow">MOD_WEBLINKS_FIELD_VALUE_NOFOLLOW</option>
</field>
<field
name="description"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="MOD_WEBLINKS_FIELD_DESCRIPTION_LABEL"
description="MOD_WEBLINKS_FIELD_DESCRIPTION_DESC">
<option
value="1">JSHOW</option>
<option
value="0">JHIDE</option>
</field>
<field
name="hits"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="MOD_WEBLINKS_FIELD_HITS_LABEL"
description="MOD_WEBLINKS_FIELD_HITS_DESC">
<option
value="1">JSHOW</option>
<option
value="0">JHIDE</option>
</field>
<field
name="count_clicks"
type="list"
class="chzn-color"
default="0"
label="MOD_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
description="MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC">
<option
value="">JGLOBAL_USE_GLOBAL</option>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
</fieldset>
<fieldset
name="advanced">
<field
name="layout"
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="textarea" rows="3"
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"
default="1"
label="COM_MODULES_FIELD_CACHING_LABEL"
description="COM_MODULES_FIELD_CACHING_DESC">
<option
value="1">JGLOBAL_USE_GLOBAL</option>
<option
value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
</field>
<field
name="cache_time"
type="text"
default="900"
label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
<field
name="cachemode"
type="hidden"
default="static">
<option
value="static"></option>
</field>
</fieldset>
</fields>
</config>
</extension>

View File

@ -0,0 +1,162 @@
<?xml version="1.0" encoding="utf-8"?>
<extension type="module" version="3.1" client="site" method="upgrade">
<name>mod_weblinks</name>
<author>Joomla! Project</author>
<creationDate>##DATE##</creationDate>
<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<version>##VERSION##</version>
<description>MOD_WEBLINKS_XML_DESCRIPTION</description>
<files>
##MODULE_FILES##
</files>
<languages folder="language">
##LANGUAGE_FILES##
</languages>
<help key="JHELP_EXTENSIONS_MODULE_MANAGER_WEBLINKS" />
<config>
<fields name="params">
<fieldset name="basic">
<field
name="catid"
type="category"
extension="com_weblinks"
required="true"
label="JCATEGORY"
description="MOD_WEBLINKS_FIELD_CATEGORY_DESC" />
<field
name="count"
type="text"
default="5"
label="MOD_WEBLINKS_FIELD_COUNT_LABEL"
description="MOD_WEBLINKS_FIELD_COUNT_DESC" />
<field
name="ordering"
type="list"
default="title"
label="MOD_WEBLINKS_FIELD_ORDERING_LABEL"
description="MOD_WEBLINKS_FIELD_ORDERING_DESC">
<option
value="title">JGLOBAL_TITLE</option>
<option
value="order">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
<option
value="hits">MOD_WEBLINKS_FIELD_VALUE_HITS</option>
</field>
<field
name="direction"
type="list"
default="asc"
label="MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL"
description="MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC">
<option
value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
<option
value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
</field>
<field
name="target"
type="list"
default="3"
label="MOD_WEBLINKS_FIELD_TARGET_LABEL"
description="MOD_WEBLINKS_FIELD_TARGET_DESC">
<option
value="1">JBROWSERTARGET_NEW</option>
<option
value="2">JBROWSERTARGET_POPUP</option>
<option
value="3">JBROWSERTARGET_PARENT</option>
</field>
<field
name="follow"
type="list"
default="0"
label="MOD_WEBLINKS_FIELD_FOLLOW_LABEL"
description="MOD_WEBLINKS_FIELD_FOLLOW_DESC">
<option
value="follow">MOD_WEBLINKS_FIELD_VALUE_FOLLOW</option>
<option
value="nofollow">MOD_WEBLINKS_FIELD_VALUE_NOFOLLOW</option>
</field>
<field
name="description"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="MOD_WEBLINKS_FIELD_DESCRIPTION_LABEL"
description="MOD_WEBLINKS_FIELD_DESCRIPTION_DESC">
<option
value="1">JSHOW</option>
<option
value="0">JHIDE</option>
</field>
<field
name="hits"
type="radio"
class="btn-group btn-group-yesno"
default="0"
label="MOD_WEBLINKS_FIELD_HITS_LABEL"
description="MOD_WEBLINKS_FIELD_HITS_DESC">
<option
value="1">JSHOW</option>
<option
value="0">JHIDE</option>
</field>
<field
name="count_clicks"
type="list"
class="chzn-color"
default="0"
label="MOD_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
description="MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC">
<option
value="">JGLOBAL_USE_GLOBAL</option>
<option
value="0">JNO</option>
<option
value="1">JYES</option>
</field>
</fieldset>
<fieldset
name="advanced">
<field
name="layout"
type="modulelayout"
label="JFIELD_ALT_LAYOUT_LABEL"
description="JFIELD_ALT_MODULE_LAYOUT_DESC" />
<field
name="moduleclass_sfx"
type="textarea" rows="3"
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
<field
name="cache"
type="list"
default="1"
label="COM_MODULES_FIELD_CACHING_LABEL"
description="COM_MODULES_FIELD_CACHING_DESC">
<option
value="1">JGLOBAL_USE_GLOBAL</option>
<option
value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
</field>
<field
name="cache_time"
type="text"
default="900"
label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
description="COM_MODULES_FIELD_CACHE_TIME_DESC" />
<field
name="cachemode"
type="hidden"
default="static">
<option
value="static"></option>
</field>
</fieldset>
</fields>
</config>
</extension>

View File

@ -2,15 +2,17 @@
<extension version="3.1" type="plugin" group="finder" method="upgrade">
<name>plg_finder_weblinks</name>
<author>Joomla! Project</author>
<creationDate>August 2011</creationDate>
<copyright>(C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
<creationDate>##DATE##</creationDate>
<copyright>(C) 2005 - ##YEAR## Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<version>3.4.1</version>
<version>##VERSION##</version>
<description>PLG_FINDER_WEBLINKS_XML_DESCRIPTION</description>
<files>
<filename plugin="weblinks">weblinks.php</filename>
<folder>language</folder>
##FILES##
</files>
<languages folder="administrator/language">
##LANGUAGE_FILES##
</languages>
</extension>

View File

@ -2,17 +2,19 @@
<extension version="3.1" type="plugin" group="search" method="upgrade">
<name>plg_search_weblinks</name>
<author>Joomla! Project</author>
<creationDate>November 2005</creationDate>
<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
<creationDate>##DATE##</creationDate>
<copyright>Copyright (C) 2005 - ##YEAR## Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
<version>3.4.1</version>
<version>##VERSION##</version>
<description>PLG_SEARCH_WEBLINKS_XML_DESCRIPTION</description>
<files>
<filename plugin="weblinks">weblinks.php</filename>
<folder>language</folder>
##FILES##
</files>
<languages folder="administrator/language">
##LANGUAGE_FILES##
</languages>
<config>
<fields name="params">

View File

@ -38,4 +38,5 @@ modules:
AcceptanceHelper:
repo_folder: '/home/travis/build/joomla-extensions/weblinks/' # Path to the Extension repository. To be used by tests to install via Install from folder
counter_test_url: 'http://localhost/tests/joomla-cms3' # the url for the weblink item used to test hits counter
url: 'http://localhost/tests/joomla-cms3' # the url that points to the joomla installation at /tests/system/joomla-cms - we need it twice here
error_level: "E_ALL & ~E_STRICT & ~E_DEPRECATED"

View File

@ -25,6 +25,7 @@ class AdministratorWeblinksCest
$I->amGoingTo('Navigate to Weblinks page in /administrator/ and verify the Tabs');
$I->amOnPage('administrator/index.php?option=com_weblinks&view=weblinks');
$I->waitForText('Web Links', '30', ['css' => 'h1']);
$I->clickToolbarButton('New');
$I->waitForText('Web Link: New', '30', ['css' => 'h1']);
$I->verifyAvailableTabs(['New Web Link', 'Images', 'Publishing', 'Options', 'Metadata']);

View File

@ -26,8 +26,10 @@ class InstallWeblinksCest
{
$I->doAdministratorLogin();
$I->comment('get Weblinks repository folder from acceptance.suite.yml (see _support/AcceptanceHelper.php)');
$path = $I->getConfiguration('repo_folder');
$I->installExtensionFromFolder(rtrim($path, "/") . '/src/com_weblinks/');
// URL where the package file to install is located (mostly the same as joomla-cms)
$url = $I->getConfiguration('url');
$I->installExtensionFromUrl($url . "/pkg-weblinks-current.zip");
$I->doAdministratorLogout();
}
}