Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mod_articles_popular]Code style #10576

Closed
wants to merge 4 commits into from
Closed

[mod_articles_popular]Code style #10576

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ceaa09
[mod_articles_popular]Code style
wojsmol May 21, 2016
c0caa07
> to new line
wojsmol May 22, 2016
40b8104
default down
wojsmol May 22, 2016
2bad85a
XML CS
wojsmol May 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/mod_articles_popular/helper.php
View file
Open in desktop
Expand Up @@ -33,10 +33,10 @@ abstract class ModArticlesPopularHelper
public static function getList(&$params)
{
// Get an instance of the generic articles model
$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));

// Set application parameters in model
$app = JFactory::getApplication();
$app = JFactory::getApplication();
$appParams = $app->getParams();
$model->setState('params', $appParams);

Expand Down Expand Up @@ -77,7 +77,7 @@ public static function getList(&$params)

foreach ($items as &$item)
{
$item->slug = $item->id . ':' . $item->alias;
$item->slug = $item->id . ':' . $item->alias;
$item->catslug = $item->catid . ':' . $item->category_alias;

if ($access || in_array($item->access, $authorised))
Expand Down
123 changes: 68 additions & 55 deletions modules/mod_articles_popular/mod_articles_popular.xml
View file
Open in desktop
Expand Up @@ -22,16 +22,16 @@
<config>
<fields name="params">
<fieldset name="basic">

<field
name="catid"
type="category"
label="JCATEGORY"
description="MOD_POPULAR_FIELD_CATEGORY_DESC"
extension="com_content"
multiple="true"
size="10"
default=""
label="JCATEGORY"
description="MOD_POPULAR_FIELD_CATEGORY_DESC" >
>
<option value="">JOPTION_ALL_CATEGORIES</option>
</field>

Expand All @@ -40,74 +40,85 @@
type="text"
default="5"
label="MOD_POPULAR_FIELD_COUNT_LABEL"
description="MOD_POPULAR_FIELD_COUNT_DESC" />
description="MOD_POPULAR_FIELD_COUNT_DESC"
/>

<field
name="show_front"
type="radio"
label="MOD_POPULAR_FIELD_FEATURED_LABEL"
description="MOD_POPULAR_FIELD_FEATURED_DESC"
class="btn-group btn-group-yesno"
default="1"
label="MOD_POPULAR_FIELD_FEATURED_LABEL"
description="MOD_POPULAR_FIELD_FEATURED_DESC">
<option
value="1">JSHOW</option>
<option
value="0">JHIDE</option>
>
<option value="1">JSHOW</option>
<option value="0">JHIDE</option>
</field>

<field name="basicspacer1" type="spacer" hr="true" />

<field name="date_filtering" type="list" default="off"

<field
name="basicspacer1"
type="spacer"
hr="true"
/>

<field
name="date_filtering"
type="list"
label="MOD_POPULAR_FIELD_DATEFILTERING_LABEL"
description="MOD_POPULAR_FIELD_DATEFILTERING_DESC"
>
<option value="off">MOD_POPULAR_OPTION_OFF_VALUE
</option>
<option value="range">MOD_POPULAR_OPTION_DATERANGE_VALUE
</option>
<option value="relative">MOD_POPULAR_OPTION_RELATIVEDAY_VALUE
</option>
default="off"
>
<option value="off">MOD_POPULAR_OPTION_OFF_VALUE</option>
<option value="range">MOD_POPULAR_OPTION_DATERANGE_VALUE</option>
<option value="relative">MOD_POPULAR_OPTION_RELATIVEDAY_VALUE</option>
</field>

<field name="date_field" type="list" default="a.created"
<field
name="date_field"
type="list"
label="MOD_POPULAR_FIELD_DATEFIELD_LABEL"
description="MOD_POPULAR_FIELD_DATEFIELD_DESC"
default="a.created"
showon="date_filtering:range,relative"
>
<option value="a.created">MOD_POPULAR_OPTION_CREATED_VALUE
</option>
<option value="a.modified">MOD_POPULAR_OPTION_MODIFIED_VALUE
</option>
<option value="a.publish_up">MOD_POPULAR_OPTION_STARTPUBLISHING_VALUE
</option>
>
<option value="a.created">MOD_POPULAR_OPTION_CREATED_VALUE</option>
<option value="a.modified">MOD_POPULAR_OPTION_MODIFIED_VALUE</option>
<option value="a.publish_up">MOD_POPULAR_OPTION_STARTPUBLISHING_VALUE</option>
</field>

<field name="start_date_range" type="calendar"
format="%Y-%m-%d %H:%M:%S"
<field
name="start_date_range"
type="calendar"
label="MOD_POPULAR_FIELD_STARTDATE_LABEL"
description="MOD_POPULAR_FIELD_STARTDATE_DESC"
format="%Y-%m-%d %H:%M:%S"
size="22"
filter="user_utc"
showon="date_filtering:range" />
showon="date_filtering:range"
/>

<field name="end_date_range" type="calendar"
format="%Y-%m-%d %H:%M:%S"
<field
name="end_date_range"
type="calendar"
label="MOD_POPULAR_FIELD_ENDDATE_LABEL"
description="MOD_POPULAR_FIELD_ENDDATE_DESC"
format="%Y-%m-%d %H:%M:%S"
size="22"
filter="user_utc"
showon="date_filtering:range" />
showon="date_filtering:range"
/>

<field name="relative_date" type="text" default="30"
<field
name="relative_date"
type="text"
label="MOD_POPULAR_FIELD_RELATIVEDATE_LABEL"
description="MOD_POPULAR_FIELD_RELATIVEDATE_DESC"
showon="date_filtering:relative" />

description="MOD_POPULAR_FIELD_RELATIVEDATE_DESC"
default="30"
showon="date_filtering:relative"
/>
</fieldset>

<fieldset
name="advanced">

<fieldsetname="advanced">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing space between fieldset and name ...

<field
name="layout"
type="modulelayout"
Expand All @@ -116,35 +127,37 @@

<field
name="moduleclass_sfx"
type="textarea" rows="3"
type="textarea"
label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC" />
description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
rows="3"
/>

<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>
description="COM_MODULES_FIELD_CACHING_DESC"
default="1"
>
<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" />
description="COM_MODULES_FIELD_CACHE_TIME_DESC"
default="900"
/>

<field
name="cachemode"
type="hidden"
default="static">
<option
value="static"></option>
default="static"
>
<option value="static"></option>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move > to a new line?

</field>

</fieldset>
Expand Down