Skip to content

Commit 03a164a

Browse files
dmitriituxdmitriitux
authored
Merge pull request #34 from Delo-Design/dev
Merge to ver. 1.4.0
2 parents 95b5cf1 + fc8f5ed commit 03a164a

File tree

186 files changed

+2749
-1079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+2749
-1079
lines changed

‎administrator/components/com_quantummanager/config.xml‎

Lines changed: 53 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,26 @@
101101
<option value="0">JNO</option>
102102
</field>
103103

104+
<field name="translit"
105+
type="radio"
106+
label="COM_QUANTUMMANAGER_CONFIG_GENERAL_TRANSLIT_LABEL"
107+
description="COM_QUANTUMMANAGER_CONFIG_GENERAL_TRANSLIT_DESC"
108+
required="true"
109+
class="btn-group"
110+
default="0">
111+
<option value="1">JYES</option>
112+
<option value="0">JNO</option>
113+
</field>
114+
104115
<field name="metafile"
105116
type="radio"
106117
label="COM_QUANTUMMANAGER_CONFIG_GENERAL_METAFILE_LABEL"
107118
description="COM_QUANTUMMANAGER_CONFIG_GENERAL_METAFILE_DESC"
108119
required="true"
109120
class="btn-group"
110121
default="1">
111-
<option value="1">JYES</option>
112-
<option value="0">JNO</option>
122+
<option value="1">COM_QUANTUMMANAGER_ACTION_SHOW</option>
123+
<option value="0">COM_QUANTUMMANAGER_ACTION_HIDE</option>
113124
</field>
114125

115126
<field name="metafileextended"
@@ -120,8 +131,19 @@
120131
class="btn-group"
121132
default="0"
122133
showon="metafile:1">
123-
<option value="1">JYES</option>
124-
<option value="0">JNO</option>
134+
<option value="1">COM_QUANTUMMANAGER_ACTION_SHOW</option>
135+
<option value="0">COM_QUANTUMMANAGER_ACTION_HIDE</option>
136+
</field>
137+
138+
<field name="metafileshowpath"
139+
type="radio"
140+
label="COM_QUANTUMMANAGER_CONFIG_GENERAL_METAFILE_SHOWPATH_LABEL"
141+
required="true"
142+
class="btn-group"
143+
default="0"
144+
showon="metafile:1">
145+
<option value="1">COM_QUANTUMMANAGER_ACTION_SHOW</option>
146+
<option value="0">COM_QUANTUMMANAGER_ACTION_HIDE</option>
125147
</field>
126148

127149
<field name="dropareahidden"
@@ -131,8 +153,8 @@
131153
required="true"
132154
class="btn-group"
133155
default="0">
134-
<option value="1">JYES</option>
135-
<option value="0">JNO</option>
156+
<option value="0">COM_QUANTUMMANAGER_ACTION_SHOW</option>
157+
<option value="1">COM_QUANTUMMANAGER_ACTION_HIDE</option>
136158
</field>
137159

138160
<field name="help"
@@ -142,8 +164,8 @@
142164
required="true"
143165
class="btn-group"
144166
default="1">
145-
<option value="1">JYES</option>
146-
<option value="0">JNO</option>
167+
<option value="1">COM_QUANTUMMANAGER_ACTION_SHOW</option>
168+
<option value="0">COM_QUANTUMMANAGER_ACTION_HIDE</option>
147169
</field>
148170

149171
<field name="review"
@@ -153,8 +175,19 @@
153175
required="true"
154176
class="btn-group"
155177
default="1">
156-
<option value="1">JYES</option>
157-
<option value="0">JNO</option>
178+
<option value="1">COM_QUANTUMMANAGER_ACTION_SHOW</option>
179+
<option value="0">COM_QUANTUMMANAGER_ACTION_HIDE</option>
180+
</field>
181+
182+
<field name="arhiveupload"
183+
type="radio"
184+
label="COM_QUANTUMMANAGER_CONFIG_GENERAL_ARHIVEUPLOAD_LABEL"
185+
description="COM_QUANTUMMANAGER_CONFIG_GENERAL_ARHIVEUPLOAD_DESC"
186+
required="true"
187+
class="btn-group"
188+
default="0">
189+
<option value="1">COM_QUANTUMMANAGER_ACTION_ENABLE</option>
190+
<option value="0">COM_QUANTUMMANAGER_ACTION_DISABLE</option>
158191
</field>
159192

160193
<field name="mimetype"
@@ -175,8 +208,8 @@
175208
required="true"
176209
class="btn-group"
177210
default="1">
178-
<option value="1">JYES</option>
179-
<option value="0">JNO</option>
211+
<option value="1">COM_QUANTUMMANAGER_ACTION_ENABLE</option>
212+
<option value="0">COM_QUANTUMMANAGER_ACTION_DISABLE</option>
180213
</field>
181214

182215
<field name="pixabay"
@@ -186,8 +219,8 @@
186219
required="true"
187220
class="btn-group"
188221
default="1">
189-
<option value="1">JYES</option>
190-
<option value="0">JNO</option>
222+
<option value="1">COM_QUANTUMMANAGER_ACTION_ENABLE</option>
223+
<option value="0">COM_QUANTUMMANAGER_ACTION_DISABLE</option>
191224
</field>
192225

193226
<field name="original"
@@ -220,8 +253,8 @@
220253
required="true"
221254
class="btn-group"
222255
default="0">
223-
<option value="1">JYES</option>
224-
<option value="0">JNO</option>
256+
<option value="1">COM_QUANTUMMANAGER_ACTION_ENABLE</option>
257+
<option value="0">COM_QUANTUMMANAGER_ACTION_DISABLE</option>
225258
</field>
226259

227260
<field name="rezizemaxwidth"
@@ -338,9 +371,10 @@
338371
<fieldset name="profiles" label="COM_QUANTUMMANAGER_CONFIG_PROFILES" description="COM_QUANTUMMANAGER_CONFIG_PROFILES_DESC">
339372

340373
<field name="profiles"
341-
type="subform"
342-
label="COM_QUANTUMMANAGER_CONFIG_PROFILES_VARIABLES"
343-
multiple="true">
374+
type="subform"
375+
layout="joomla.form.field.subform.repeatable-table"
376+
label="COM_QUANTUMMANAGER_CONFIG_PROFILES_VARIABLES"
377+
multiple="true">
344378
<form>
345379

346380
<field

‎administrator/components/com_quantummanager/controllers/quantumviewfiles.php‎

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
class QuantummanagerControllerquantumviewfiles extends AdminController
2323
{
2424

25-
2625
public function createDirectory()
2726
{
2827
$app = Factory::getApplication();
@@ -39,7 +38,6 @@ public function createDirectory()
3938
$app->close();
4039
}
4140

42-
4341
public function getFiles()
4442
{
4543
$app = Factory::getApplication();
@@ -56,7 +54,6 @@ public function getFiles()
5654
$app->close();
5755
}
5856

59-
6057
public function getMetaFile()
6158
{
6259
$app = Factory::getApplication();
@@ -103,6 +100,41 @@ public function watermark()
103100
$app->close();
104101
}
105102

103+
public function paste()
104+
{
105+
$app = Factory::getApplication();
106+
$data = $app->input->getArray();
107+
108+
if(!isset(
109+
$data['pathFrom'],
110+
$data['scopeFrom'],
111+
$data['pathTo'],
112+
$data['scopeTo'],
113+
$data['cut'],
114+
$data['list'])
115+
)
116+
{
117+
$app->close();
118+
}
119+
120+
$pathFrom = $data['pathFrom'];
121+
$scopeFrom = $data['scopeFrom'];
122+
$pathTo = $data['pathTo'];
123+
$scopeTo = $data['scopeTo'];
124+
$cut = (int)$data['cut'];
125+
$list = json_decode($data['list'], JSON_OBJECT_AS_ARRAY);
126+
127+
if(count($list) === 0)
128+
{
129+
$app->close();
130+
}
131+
132+
JLoader::register('QuantummanagerFileSystemLocal', JPATH_ROOT . '/administrator/components/com_quantummanager/filesystem/local.php');
133+
echo QuantummanagerFileSystemLocal::paste($pathFrom, $scopeFrom, $pathTo, $scopeTo, $cut, $list);
134+
135+
$app->close();
136+
}
137+
106138
public function delete()
107139
{
108140
$app = Factory::getApplication();
@@ -124,7 +156,6 @@ public function delete()
124156

125157
}
126158

127-
128159
public function getParsePath()
129160
{
130161
try {
@@ -158,7 +189,6 @@ public function getParsePath()
158189
}
159190
}
160191

161-
162192
public function renameFile()
163193
{
164194
try {

‎administrator/components/com_quantummanager/fields/quantumcodemirror.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ public function getInput()
6767
$doc = Factory::getDocument();
6868
$this->__set('standalone', $this->getAttribute('standalone', true));
6969

70+
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
71+
QuantummanagerHelper::includeScriptHead();
72+
7073
HTMLHelper::_('stylesheet', 'com_quantummanager/main.css', [
7174
'version' => filemtime(__FILE__),
7275
'relative' => true

‎administrator/components/com_quantummanager/fields/quantumcombine.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,19 @@ class JFormFieldQuantumCombine extends JFormField
4444
*/
4545
protected $renderLabelLayout = 'renderlabel';
4646

47+
48+
public function __construct($form = null)
49+
{
50+
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
51+
parent::__construct($form);
52+
}
53+
54+
4755
/**
4856
* @return array
4957
*/
5058
protected function getLayoutData()
5159
{
52-
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
5360
$scopes = QuantummanagerHelper::getAllScope();
5461

5562
return array_merge(parent::getLayoutData(),
@@ -86,6 +93,8 @@ public function getInput()
8693
{
8794
try {
8895

96+
QuantummanagerHelper::includeScriptHead();
97+
8998
$componentParams = ComponentHelper::getParams('com_quantummanager');
9099

91100
if(empty($this->fields))
@@ -108,7 +117,8 @@ public function getInput()
108117
{
109118
HTMLHelper::_('script', 'com_quantummanager/' . $this->layout . '.js', [
110119
'version' => filemtime(__FILE__),
111-
'relative' => true
120+
'relative' => true,
121+
'defer' => 'defer'
112122
]);
113123
}
114124

‎administrator/components/com_quantummanager/fields/quantumcropperjs.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,13 @@ public function getInput()
6767
{
6868
try {
6969

70+
7071
$this->__set('standalone', $this->getAttribute('standalone', true));
7172
$this->__set('cssClass', $this->getAttribute('cssClass', ''));
7273

74+
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
75+
QuantummanagerHelper::includeScriptHead();
76+
7377
HTMLHelper::_('stylesheet', 'com_quantummanager/main.css', [
7478
'version' => filemtime(__FILE__),
7579
'relative' => true

‎administrator/components/com_quantummanager/fields/quantumpixabay.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public function getInput()
6666
$this->__set('standalone', $this->getAttribute('standalone', true));
6767
$this->__set('cssClass', $this->getAttribute('cssClass', ''));
6868

69+
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
70+
QuantummanagerHelper::includeScriptHead();
71+
6972
HTMLHelper::_('stylesheet', 'com_quantummanager/main.css', [
7073
'version' => filemtime(__FILE__),
7174
'relative' => true

‎administrator/components/com_quantummanager/fields/quantumtoolbar.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ public function getInput()
7070
$this->__set('buttonsBun', $this->getAttribute('buttonsBun', ','));
7171
$this->__set('cssClass', $this->getAttribute('cssClass', ''));
7272

73+
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
74+
QuantummanagerHelper::includeScriptHead();
75+
7376
HTMLHelper::_('stylesheet', 'com_quantummanager/main.css', [
7477
'version' => filemtime(__FILE__),
7578
'relative' => true

‎administrator/components/com_quantummanager/fields/quantumtreecatalogs.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ public function getInput()
6868
$this->__set('cssClass', $this->getAttribute('cssClass', ''));
6969
$this->directory = $this->getAttribute('directory', 'images');
7070

71+
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
72+
QuantummanagerHelper::includeScriptHead();
73+
7174
HTMLHelper::_('stylesheet', 'com_quantummanager/main.css', [
7275
'version' => filemtime(__FILE__),
7376
'relative' => true

‎administrator/components/com_quantummanager/fields/quantumunsplash.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public function getInput()
6666
$this->__set('standalone', $this->getAttribute('standalone', true));
6767
$this->__set('cssClass', $this->getAttribute('cssClass', ''));
6868

69+
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
70+
QuantummanagerHelper::includeScriptHead();
71+
6972
HTMLHelper::_('stylesheet', 'com_quantummanager/main.css', [
7073
'version' => filemtime(__FILE__),
7174
'relative' => true

‎administrator/components/com_quantummanager/fields/quantumupload.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ public function getInput()
7171
$this->scope = $this->getAttribute('scope', '');
7272
$this->dropAreaHidden = $this->getAttribute('dropAreaHidden', '0');
7373

74+
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
75+
QuantummanagerHelper::includeScriptHead();
76+
7477
HTMLHelper::_('stylesheet', 'com_quantummanager/main.css', [
7578
'version' => filemtime(__FILE__),
7679
'relative' => true

0 commit comments

Comments
 (0)