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

Merge branch '4.0-compatible-layouts' into 4.0-compatible-layouts-frontend

This commit is contained in:
chmst 2021-07-26 17:08:20 +02:00
commit 5dc2bfb818
9 changed files with 180 additions and 195 deletions

View File

@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<access component="com_weblinks">
<section name="component">
<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
<action name="core.edit.value" title="JACTION_EDITVALUE" description="JACTION_EDITVALUE_COMPONENT_DESC" />
<action name="core.admin" title="JACTION_ADMIN" />
<action name="core.options" title="JACTION_OPTIONS" />
<action name="core.manage" title="JACTION_MANAGE" />
<action name="core.create" title="JACTION_CREATE" />
<action name="core.delete" title="JACTION_DELETE" />
<action name="core.edit" title="JACTION_EDIT" />
<action name="core.edit.state" title="JACTION_EDITSTATE" />
<action name="core.edit.own" title="JACTION_EDITOWN" />
<action name="core.edit.value" title="JACTION_EDITVALUE" />
</section>
<section name="category">
<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC" />
<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC" />
<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC" />
<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC" />
<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC" />
<action name="core.create" title="JACTION_CREATE" />
<action name="core.delete" title="JACTION_DELETE" />
<action name="core.edit" title="JACTION_EDIT" />
<action name="core.edit.state" title="JACTION_EDITSTATE" />
<action name="core.edit.own" title="JACTION_EDITOWN" />
</section>
<section name="fieldgroup">
<action name="core.create" title="JACTION_CREATE" description="COM_FIELDS_GROUP_PERMISSION_CREATE_DESC" />
<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_GROUP_PERMISSION_DELETE_DESC" />
<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_GROUP_PERMISSION_EDIT_DESC" />
<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_GROUP_PERMISSION_EDITSTATE_DESC" />
<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC" />
<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_GROUP_PERMISSION_EDITVALUE_DESC" />
<action name="core.create" title="JACTION_CREATE" />
<action name="core.delete" title="JACTION_DELETE" />
<action name="core.edit" title="JACTION_EDIT" />
<action name="core.edit.state" title="JACTION_EDITSTATE" />
<action name="core.edit.own" title="JACTION_EDITOWN" />
<action name="core.edit.value" title="JACTION_EDITVALUE" />
</section>
<section name="field">
<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_FIELD_PERMISSION_DELETE_DESC" />
<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_FIELD_PERMISSION_EDIT_DESC" />
<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_FIELD_PERMISSION_EDITSTATE_DESC" />
<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_FIELD_PERMISSION_EDITVALUE_DESC" />
<action name="core.delete" title="JACTION_DELETE" />
<action name="core.edit" title="JACTION_EDIT" />
<action name="core.edit.state" title="JACTION_EDITSTATE" />
<action name="core.edit.value" title="JACTION_EDITVALUE" />
</section>
</access>

View File

@ -20,9 +20,9 @@
<field
name="target"
type="list"
default="0"
description="COM_WEBLINKS_FIELD_TARGET_DESC"
label="COM_WEBLINKS_FIELD_TARGET_LABEL"
default="0"
validate="options"
>
<option value="0">JBROWSERTARGET_PARENT</option>
<option value="1">JBROWSERTARGET_NEW</option>
@ -33,9 +33,9 @@
<field
name="save_history"
type="radio"
label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
layout="joomla.form.field.radio.switcher"
default="0"
label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
@ -43,20 +43,19 @@
<field
name="history_limit"
type="text"
filter="integer"
type="number"
label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
default="5"
filter="integer"
default="10"
showon="save_history:1"
/>
<field
name="count_clicks"
type="radio"
label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
layout="joomla.form.field.radio.switcher"
default="1"
label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
@ -73,7 +72,6 @@
type="list"
default="1"
label="COM_WEBLINKS_FIELD_ICON_LABEL"
description="COM_WEBLINKS_FIELD_ICON_DESC"
filter="integer"
>
<option value="0">COM_WEBLINKS_FIELD_ICON_OPTION_TEXT</option>
@ -98,7 +96,8 @@
name="float_first"
type="list"
label="COM_WEBLINKS_FLOAT_FIRST_LABEL"
description="COM_WEBLINKS_FLOAT_FIRST_DESC"
default="none"
validate="options"
>
<option value="right">COM_WEBLINKS_RIGHT</option>
<option value="left">COM_WEBLINKS_LEFT</option>
@ -109,7 +108,8 @@
name="float_second"
type="list"
label="COM_WEBLINKS_FLOAT_SECOND_LABEL"
description="COM_WEBLINKS_FLOAT_SECOND_DESC"
default="none"
validate="options"
>
<option value="right">COM_WEBLINKS_RIGHT</option>
<option value="left">COM_WEBLINKS_LEFT</option>
@ -121,14 +121,12 @@
type="spacer"
hr="true"
/>
<field
id="show_tags"
name="show_tags"
type="radio"
label="COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL"
layout="joomla.form.field.radio.switcher"
default="1"
label="COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -143,8 +141,8 @@
<field
name="category_layout"
type="componentlayout"
class="form-select"
label="JGLOBAL_FIELD_LAYOUT_LABEL"
class="form-select"
menuitems="true"
extension="com_weblinks"
view="category"
@ -153,8 +151,8 @@
<field
name="show_category_title"
type="radio"
layout="joomla.form.field.radio.switcher"
label="JGLOBAL_SHOW_CATEGORY_TITLE"
layout="joomla.form.field.radio.switcher"
default="1"
>
<option value="0">JHIDE</option>
@ -164,9 +162,9 @@
<field
name="show_description"
type="radio"
label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
layout="joomla.form.field.radio.switcher"
default="1"
label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -175,9 +173,9 @@
<field
name="show_description_image"
type="radio"
layout="joomla.form.field.radio.switcher"
default="1"
label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
layout="joomla.form.field.radio.switcher"
default="0"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -188,6 +186,7 @@
type="list"
label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
default="-1"
validate="options"
>
<option value="0">JNONE</option>
<option value="-1">JALL</option>
@ -201,8 +200,8 @@
<field
name="show_empty_categories"
type="radio"
layout="joomla.form.field.radio.switcher"
label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
layout="joomla.form.field.radio.switcher"
default="0"
>
<option value="0">JHIDE</option>
@ -212,9 +211,9 @@
<field
name="show_subcat_desc"
type="radio"
layout="joomla.form.field.radio.switcher"
default="1"
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
default="1"
layout="joomla.form.field.radio.switcher"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -223,9 +222,9 @@
<field
name="show_cat_num_links"
type="radio"
label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
layout="joomla.form.field.radio.switcher"
default="1"
label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -251,9 +250,9 @@
<field
name="show_base_description"
type="radio"
label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
layout="joomla.form.field.radio.switcher"
default="1"
label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -262,9 +261,11 @@
<field
name="maxLevelcat"
type="list"
default="-1"
label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
default="-1"
validate="options"
>
<option value="0">JNONE</option>
<option value="-1">JALL</option>
<option value="1">J1</option>
<option value="2">J2</option>
@ -276,9 +277,10 @@
<field
name="show_empty_categories_cat"
type="radio"
label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
layout="joomla.form.field.radio.switcher"
default="0"
label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
showon="maxLevelcat:-1,1,2,3,4,5"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -287,20 +289,21 @@
<field
name="show_subcat_desc_cat"
type="radio"
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
layout="joomla.form.field.radio.switcher"
default="1"
label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
showon="maxLevelcat:-1,1,2,3,4,5"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
<field
name="show_cat_num_links_cat"
name="show_cat_num_articles_cat"
type="radio"
label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
layout="joomla.form.field.radio.switcher"
default="1"
label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -315,8 +318,8 @@
<field
name="filter_field"
type="list"
default="1"
label="JGLOBAL_FILTER_FIELD_LABEL"
default="1"
>
<option value="1">JSHOW</option>
<option value="hide">JHIDE</option>
@ -397,9 +400,9 @@
<field
name="show_feed_link"
type="radio"
label="JGLOBAL_SHOW_FEED_LINK_LABEL"
layout="joomla.form.field.radio.switcher"
default="1"
label="JGLOBAL_SHOW_FEED_LINK_LABEL"
>
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
@ -408,9 +411,8 @@
<field
name="custom_fields_enable"
type="radio"
layout="joomla.form.field.radio.switcher"
label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
>
<option value="0">JNO</option>

View File

@ -12,7 +12,6 @@
name="published"
type="status"
label="JOPTION_FILTER_PUBLISHED"
description="JOPTION_FILTER_PUBLISHED_DESC"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_PUBLISHED</option>
@ -21,7 +20,6 @@
name="category_id"
type="category"
label="JOPTION_FILTER_CATEGORY"
description="JOPTION_FILTER_CATEGORY_DESC"
extension="com_weblinks"
onchange="this.form.submit();"
>
@ -31,7 +29,6 @@
name="access"
type="accesslevel"
label="JOPTION_FILTER_ACCESS"
description="JOPTION_FILTER_ACCESS_DESC"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_ACCESS</option>
@ -40,7 +37,6 @@
name="language"
type="contentlanguage"
label="JOPTION_FILTER_LANGUAGE"
description="JOPTION_FILTER_LANGUAGE_DESC"
onchange="this.form.submit();"
>
<option value="">JOPTION_SELECT_LANGUAGE</option>
@ -50,7 +46,6 @@
name="tag"
type="tag"
label="JOPTION_FILTER_TAG"
description="JOPTION_FILTER_TAG_DESC"
mode="nested"
onchange="this.form.submit();"
>
@ -60,7 +55,6 @@
name="level"
type="integer"
label="JOPTION_FILTER_LEVEL"
description="JOPTION_FILTER_LEVEL_DESC"
first="1"
last="10"
step="1"

View File

@ -7,7 +7,6 @@
name="id"
type="text"
label="JGLOBAL_FIELD_ID_LABEL"
description="JGLOBAL_FIELD_ID_DESC"
readonly="true"
class="readonly"
default="0"
@ -17,17 +16,15 @@
name="title"
type="text"
label="JGLOBAL_TITLE"
description="COM_WEBLINKS_FIELD_TITLE_DESC"
class="input-xxlarge input-large-text"
size="40"
required="true"
maxlength="250"
/>
<field
name="alias"
type="text"
label="JFIELD_ALIAS_LABEL"
size="40"
description="JFIELD_ALIAS_DESC"
hint="JFIELD_ALIAS_PLACEHOLDER"
/>
@ -35,7 +32,6 @@
name="catid"
type="categoryedit"
label="JCATEGORY"
description="COM_WEBLINKS_FIELD_CATEGORY_DESC"
extension="com_weblinks"
addfieldprefix="Joomla\Component\Categories\Administrator\Field"
required="true"
@ -46,10 +42,8 @@
name="url"
type="url"
label="COM_WEBLINKS_FIELD_URL_LABEL"
description="COM_WEBLINKS_FIELD_URL_DESC"
class="span12"
filter="url"
size="40"
validate="url"
required="true"
/>
@ -57,7 +51,6 @@
name="description"
type="editor"
label="JGLOBAL_DESCRIPTION"
description="COM_WEBLINKS_FIELD_DESCRIPTION_DESC"
buttons="true"
hide="pagebreak,readmore"
filter="JComponentHelper::filterText"
@ -67,21 +60,19 @@
name="hits"
type="text"
label="JGLOBAL_HITS"
description="COM_WEBLINKS_HITS_DESC"
class="readonly"
size="6"
readonly="true"
filter="unset"
default="0"
/>
<field
name="state"
type="list"
label="JSTATUS"
description="COM_WEBLINKS_FIELD_STATE_DESC"
class="chzn-color-state"
size="1"
class="form-select-color-state"
default="1"
validate="options"
>
<option value="1">JPUBLISHED</option>
<option value="0">JUNPUBLISHED</option>
@ -94,7 +85,6 @@
name="ordering"
type="ordering"
label="JFIELD_ORDERING_LABEL"
description="JFIELD_ORDERING_DESC"
content_type="com_weblinks.weblink"
/>
@ -102,15 +92,14 @@
name="access"
type="accesslevel"
label="JFIELD_ACCESS_LABEL"
description="JFIELD_ACCESS_DESC"
size="1"
filter="UINT"
validate="options"
/>
<field
name="language"
type="contentlanguage"
label="JFIELD_LANGUAGE_LABEL"
description="COM_WEBLINKS_FIELD_LANGUAGE_DESC"
>
<option value="*">JALL</option>
</field>
@ -119,6 +108,7 @@
name="tags"
type="tag"
label="JTAG"
class="advancedSelect"
multiple="true"
/>
@ -126,18 +116,15 @@
name="version_note"
type="text"
label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
size="45"
labelclass="control-label"
maxlength="250"
/>
<field
name="created"
type="calendar"
label="JGLOBAL_FIELD_CREATED_LABEL"
description="JGLOBAL_FIELD_CREATED_DESC"
size="22"
format="%Y-%m-%d %H:%M:%S"
translateformat="true"
showtime="true"
filter="user_utc"
/>
@ -145,26 +132,23 @@
name="created_by"
type="user"
label="JGLOBAL_FIELD_CREATED_BY_LABEL"
description="JGLOBAL_FIELD_CREATED_BY_Desc"
validate="UserId"
/>
<field
name="created_by_alias"
type="text"
label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
size="20"
/>
<field
name="modified"
type="calendar"
label="JGLOBAL_FIELD_MODIFIED_LABEL"
description="COM_WEBLINKS_FIELD_MODIFIED_DESC"
class="readonly"
size="22"
readonly="true"
format="%Y-%m-%d %H:%M:%S"
translateformat="true"
showtime="true"
filter="user_utc"
/>
@ -175,6 +159,7 @@
class="readonly"
readonly="true"
filter="unset"
validate="UserId"
/>
<field
@ -193,9 +178,8 @@
name="publish_up"
type="calendar"
label="JGLOBAL_FIELD_PUBLISH_UP_LABEL"
description="JGLOBAL_FIELD_PUBLISH_UP_DESC"
format="%Y-%m-%d %H:%M:%S"
size="22"
translateformat="true"
showtime="true"
filter="user_utc"
/>
@ -203,9 +187,8 @@
name="publish_down"
type="calendar"
label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL"
description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC"
format="%Y-%m-%d %H:%M:%S"
size="22"
translateformat="true"
showtime="true"
filter="user_utc"
/>
@ -213,9 +196,7 @@
name="version"
type="text"
label="COM_WEBLINKS_FIELD_VERSION_LABEL"
description="COM_WEBLINKS_FIELD_VERSION_DESC"
class="readonly"
size="6"
readonly="true"
filter="unset"
/>
@ -224,7 +205,6 @@
name="metakey"
type="textarea"
label="JFIELD_META_KEYWORDS_LABEL"
description="JFIELD_META_KEYWORDS_DESC"
rows="3"
cols="30"
/>
@ -233,17 +213,16 @@
name="metadesc"
type="textarea"
label="JFIELD_META_DESCRIPTION_LABEL"
description="JFIELD_META_DESCRIPTION_DESC"
rows="3"
cols="30"
maxlength="160"
charcounter="true"
/>
<field
name="xreference"
type="text"
label="JFIELD_XREFERENCE_LABEL"
description="JFIELD_XREFERENCE_DESC"
size="20"
/>
</fieldset>
@ -259,7 +238,6 @@
name="target"
type="list"
label="COM_WEBLINKS_FIELD_TARGET_LABEL"
description="COM_WEBLINKS_FIELD_TARGET_DESC"
default=""
useglobal="true"
>
@ -273,7 +251,6 @@
name="width"
type="text"
label="COM_WEBLINKS_FIELD_WIDTH_LABEL"
description="COM_WEBLINKS_FIELD_WIDTH_DESC"
class="validate-numeric"
/>
@ -281,17 +258,14 @@
name="height"
type="text"
label="COM_WEBLINKS_FIELD_HEIGHT_LABEL"
description="COM_WEBLINKS_FIELD_HEIGHT_DESC"
class="validate-numeric"
/>
<field
name="count_clicks"
type="list"
type="radio"
label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC"
class="chzn-color"
useglobal="true"
layout="joomla.form.field.radio.switcher"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
@ -330,7 +304,6 @@
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_ALT_DESC"
size="20"
/>
<field
@ -338,7 +311,6 @@
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC"
size="20"
/>
<field
@ -358,7 +330,6 @@
name="float_second"
type="list"
label="COM_WEBLINKS_FLOAT_SECOND_LABEL"
description="COM_WEBLINKS_FLOAT_SECOND_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="right">COM_WEBLINKS_RIGHT</option>
@ -371,7 +342,6 @@
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_ALT_DESC"
size="20"
/>
<field
@ -379,7 +349,6 @@
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC"
size="20"
/>
</fieldset>
</fields>
@ -396,7 +365,7 @@
name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
validate="options"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
@ -409,11 +378,6 @@
name="rights"
type="text"
label="JFIELD_META_RIGHTS_LABEL"
description="JFIELD_META_RIGHTS_DESC"
required="false"
filter="string"
cols="30"
rows="2"
/>
</fieldset>
</fields>

View File

@ -37,15 +37,19 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
<div class="form-horizontal">
<div class="main-card">
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', empty($this->item->id) ? Text::_('COM_WEBLINKS_NEW_WEBLINK', true) : Text::_('COM_WEBLINKS_EDIT_WEBLINK', true)); ?>
<div class="row">
<div class="col-md-9">
<div class="form-vertical">
<?php echo $this->form->renderField('url'); ?>
<?php echo $this->form->renderField('description'); ?>
<div>
<fieldset class="adminform">
<?php echo $this->form->renderField('url'); ?>
<?php echo $this->form->renderField('description'); ?>
</fieldset>
</div>
</div>
</div>
<div class="col-md-3">
@ -55,33 +59,47 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'images', Text::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS', true)); ?>
<div class="row">
<div class="col-md-6">
<?php echo $this->form->renderField('images'); ?>
<?php foreach ($this->form->getGroup('images') as $field) : ?>
<?php echo $field->renderField(); ?>
<?php endforeach; ?>
</div>
<div class="row">
<div class="col-12">
<fieldset id="fieldset-image; ?>" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS'); ?></legend>
<div>
<?php echo $this->form->renderField('imaJGLOBAL_FIELDSET_IMAGE_OPTIONSges'); ?>
<?php foreach ($this->form->getGroup('images') as $field) : ?>
<?php echo $field->renderField(); ?>
<?php endforeach; ?>
</div>
</fieldset>
</div>
</div>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING', true)); ?>
<div class="row form-horizontal-desktop">
<div class="col-md-6">
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
<div class="row">
<div class="col-12 col-lg-6">
<fieldset id="fieldset-publishingdata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</fieldset>
</div>
<div class="col-12 col-lg-6">
<fieldset id="fieldset-metadata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
</fieldset>
</div>
</div>
<div class="col-md-6">
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
</div>
</div>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
<?php if (!$isModal && $assoc) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
<?php echo $this->loadTemplate('associations'); ?>
<fieldset id="fieldset-associations" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php elseif ($isModal && $assoc) : ?>
<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>

View File

@ -131,7 +131,7 @@ if ($saveOrder && !empty($this->items))
<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'weblinks.', $canCheckin); ?>
<?php endif; ?>
<?php if ($canEdit || $canEditOwn) : ?>
<a href="<?php echo Route::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape($item->name); ?>">
<a href="<?php echo Route::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape($item->title); ?>">
<?php echo $this->escape($item->title); ?></a>
<?php else : ?>
<?php echo $this->escape($item->title); ?>

View File

@ -8,19 +8,22 @@
*/
defined('_JEXEC') or die;
use Joomla\CMS\Language\Multilanguage;
use Joomla\CMS\Layout\LayoutHelper;
$published = $this->state->get('filter.published');
?>
<div class="container-fluid">
<div class="row-fluid">
<div class="control-group span6">
<div class="controls">
<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
<div class="p-3">
<div class="row">
<?php if (Multilanguage::isEnabled()) : ?>
<div class="form-group col-md-6">
<div class="controls">
<?php echo LayoutHelper::render('joomla.html.batch.language', []); ?>
</div>
</div>
</div>
<div class="control-group span6">
<?php endif;?>
<div class="form-group col-md-6">
<div class="controls">
<?php echo LayoutHelper::render('joomla.html.batch.access', []); ?>
</div>
@ -28,13 +31,13 @@ $published = $this->state->get('filter.published');
</div>
<div class="row-fluid">
<?php if ($published >= 0) : ?>
<div class="control-group span6">
<div class="form-group col-md-6">
<div class="controls">
<?php echo LayoutHelper::render('joomla.html.batch.item', ['extension' => 'com_weblinks']); ?>
</div>
</div>
<?php endif; ?>
<div class="control-group span6">
<div class="form-group col-md-6">
<div class="controls">
<?php echo LayoutHelper::render('joomla.html.batch.tag', []); ?>
</div>

View File

@ -9,11 +9,10 @@
defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;
?>
<a class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
<?php echo Text::_('JCANCEL'); ?>
</a>
<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('weblink.batch');">
</button>
<button type="submit" id='batch-submit-button-id' class="btn btn-success" data-submit-task='weblink.batch'>
<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
</button>
</button>

View File

@ -6,6 +6,7 @@
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;
use Joomla\CMS\Factory;
@ -14,31 +15,29 @@ use Joomla\CMS\Language\Multilanguage;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Session\Session;
use Joomla\Component\Weblinks\Site\Helper\RouteHelper;
$app = Factory::getApplication();
if ($app->isClient('site'))
{
JSession::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
}
// Include the component HTML helpers.
HTMLHelper::_('behavior.multiselect');
HTMLHelper::_('behavior.core');
HTMLHelper::_('script', 'com_weblinks/admin-weblinks-modal.js', array('version' => 'auto', 'relative' => true));
HTMLHelper::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
HTMLHelper::_('formbehavior.chosen', 'select');
// Special case for the search field tooltip.
$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
HTMLHelper::_('bootstrap.tooltip', '#filter_search', array('title' => Text::_($searchFilterDesc), 'placement' => 'bottom'));
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->useScript('core')
->useScript('com_weblinks.admin-weblinks-modal');
$function = $app->input->getCmd('function', 'jSelectWeblink');
$editor = $app->input->getCmd('editor', '');
$listOrder = $this->escape($this->state->get('list.ordering'));
$listDirn = $this->escape($this->state->get('list.direction'));
$onclick = $this->escape($function);
$multilang = Multilanguage::isEnabled();
if (!empty($editor))
{
@ -57,48 +56,49 @@ $iconStates = array(
?>
<div class="container-popup">
<form action="<?php echo Route::_('index.php?option=com_weblinks&view=weblinks&layout=modal&tmpl=component&function=' . $function . '&' . JSession::getFormToken() . '=1&editor=' . $editor); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<div class="clearfix"></div>
<form action="<?php echo Route::_('index.php?option=com_weblinks&view=weblinks&layout=modal&tmpl=component&function=' . $function . '&' . Session::getFormToken() . '=1&editor=' . $editor); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-no-items">
<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
</div>
<?php else : ?>
<table class="table table-striped table-condensed">
<table class="table table-sm">
<caption class="visually-hidden">
<?php echo Text::_('COM_WEBLINKS_WEBLINKS_TABLE_CAPTION'); ?>,
<span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
<span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
</caption>
<thead>
<tr>
<th width="1%" class="center nowrap">
<th scope="col" class="w-1 text-center">
<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
</th>
<th class="title">
<th scope="col" class="title">
<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
</th>
<th width="10%" class="nowrap hidden-phone">
<th scope="col" class="w-10 d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
</th>
<th width="15%" class="nowrap">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
</th>
<th width="5%" class="nowrap hidden-phone">
<?php if ($multilang) : ?>
<th scope="col" class="w-15">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
</th>
<?php endif; ?>
<th scope="col" class="w-10 d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
</th>
<th width="1%" class="nowrap hidden-phone">
<th scope="col" class="w-1 d-none d-md-table-cell">
<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="6">
<?php echo $this->pagination->getListFooter(); ?>
</td>
</tr>
</tfoot>
<tbody>
<?php foreach ($this->items as $i => $item) : ?>
<?php $lang = ''; ?>
<?php if ($item->language && Multilanguage::isEnabled()) : ?>
<?php if ($item->language && $multilang) : ?>
<?php $tag = strlen($item->language); ?>
<?php if ($tag == 5) : ?>
<?php $lang = substr($item->language, 0, 2); ?>
@ -110,7 +110,7 @@ $iconStates = array(
<td class="center">
<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
</td>
<td>
<th scope="row">
<?php $attribs = 'data-function="' . $this->escape($onclick) . '"'
. ' data-id="' . $item->id . '"'
. ' data-title="' . $this->escape(addslashes($item->title)) . '"'
@ -124,17 +124,19 @@ $iconStates = array(
<div class="small">
<?php echo Text::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
</div>
</td>
<td class="small hidden-phone">
</th>
<td class="small d-none d-md-table-cell">
<?php echo $this->escape($item->access_level); ?>
</td>
<td class="small">
<?php echo LayoutHelper::render('joomla.content.language', $item); ?>
</td>
<td class="nowrap small hidden-phone">
<?php if ($multilang) : ?>
<td class="small">
<?php echo LayoutHelper::render('joomla.content.language', $item); ?>
</td>
<?php endif; ?>
<td class="small d-none d-md-table-cell">
<?php echo HTMLHelper::_('date', $item->created, Text::_('DATE_FORMAT_LC4')); ?>
</td>
<td class="nowrap small hidden-phone">
<td class="small d-none d-md-table-cell">
<?php echo (int) $item->id; ?>
</td>
</tr>
@ -143,6 +145,9 @@ $iconStates = array(
</table>
<?php endif; ?>
<?php // load the pagination. ?>
<?php echo $this->pagination->getListFooter(); ?>
<input type="hidden" name="task" value="" />
<input type="hidden" name="boxchecked" value="0" />
<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>" />