Skip to content

Commit 55b8966

Browse files
dmitriituxdmitriitux
committed
Исправления к 1.3
1 parent 018961d commit 55b8966

File tree

21 files changed

+231
-179
lines changed

21 files changed

+231
-179
lines changed

‎administrator/components/com_quantummanager/config.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@
33

44
<fieldset name="general" label="COM_QUANTUMMANAGER_CONFIG_GENERAL" description="COM_QUANTUMMANAGER_CONFIG_GENERAL_DESC">
55

6-
<field type="quantumconfigdescription"
7-
label=""
8-
fromText="COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_DESC"
9-
addfieldpath="/administrator/components/com_quantummanager/fields"
6+
<field type="note"
7+
label="COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_LABEL"
8+
description="COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_DESC"
9+
class="alert alert-info"
10+
/>
11+
12+
<field type="note"
13+
label="COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_VARIABLES_LABEL"
14+
description="COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_DESC"
15+
class="alert alert-info"
1016
/>
1117

1218
<field name="scopes"

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎administrator/components/com_quantummanager/helpers/image.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ public function resizeWatermark($file)
9393
$logoHeight = imagesy($logo);
9494
$imageWidth = imagesx($fileString);
9595
$imageHeight = imagesy($fileString);
96-
$imageX = $padding;
97-
$imageY = $padding;
9896

9997
if((int)$this->paramsComponent->get('overlaypercent', 0))
10098
{
@@ -129,7 +127,7 @@ public function resizeWatermark($file)
129127
}
130128

131129
$watermark = $manager->make($logo);
132-
$image->insert($watermark, $position);
130+
$image->insert($watermark, $position, $padding, $padding);
133131

134132
$image->save($file);
135133

‎administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.ini‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ COM_QUANTUMMANAGER_EMPTY_MIMETYPE="Unknown mime type"
1313

1414
COM_QUANTUMMANAGER_CONFIG_GENERAL="Global settings"
1515
COM_QUANTUMMANAGER_CONFIG_GENERAL_DESC="Here are global settings for entire file manager"
16+
COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_LABEL="Documentation"
17+
COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_DESC="If you have difficulties with configuring the file manager, you can read the documentation on the following URL: <a href=\"https://www.norrnext.com/docs/joomla-extensions/quantum-manager\" target="_blank">https://www.norrnext.com/docs/joomla-extensions/quantum-manager</a><br /> <a href=\"https://www.norrnext.com/forum/quantum-manager\" target=\"_blank\">Support</a> | <a href=\"https://www.norrnext.com/quantum-manager\" target=\"_blank\">Product page</a> | <a href=\"https://extensions.joomla.org/extension/quantum-manager/\" target=\"_blank\">Reviews on the JED</a>"
1618
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_LABEL="Default scopes"
1719
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_NAME_LABEL="Name scope"
1820
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_ENABLE_LABEL="Enable scope"
1921
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_PATH_LABEL="Folder"
2022
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_CUSTOM_LABEL="Custom scopes"
2123
COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_LABEL="Default folder"
24+
COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_VARIABLES_LABEL="Path variables"
2225
COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_DESC="Enter the path to files for this field. <br/> Available varables: <br /><b>{user_id}</b> - ID of current user<br /><b>{year}</b> - current year<br /><b>{month}</b> - curreny month<br/><b>{day}</b> - current day<br/><b>{hours}</b> - current hour<br/><b>{minutes}</b> - hours<br/><b>{second}</b> - seconds<br/><b>{unix}</b> - UNIX time in seconds <br/><br/>Example of use:<br/>images/{user_id}/{year}-{month}-{day}"
2326
COM_QUANTUMMANAGER_CONFIG_GENERAL_MAXSIZEFILENAME_LABEL="Maximum length of file or folder name"
2427
COM_QUANTUMMANAGER_CONFIG_GENERAL_MAXSIZE_LABEL="Maximum file size for uploading <br /> in megabytes"
@@ -130,7 +133,7 @@ COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_LABEL_RATIO="Ratio"
130133
COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_LABEL_SAVE_RATIO="Save ratio"
131134

132135
COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_BUTTON="Search in Unsplash"
133-
COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_NOTFOUND="Nothing found, try asking differently."
136+
COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_NOTFOUND="Nothing found, try another search request."
134137
COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_BUTTON_LOAD="Load more"
135138
COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_SAVE="Save"
136139
COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_CLOSE="Close"
@@ -168,8 +171,8 @@ COM_QUANTUMMANAGER_FILE_METAINFO_WIDTH="Width"
168171
COM_QUANTUMMANAGER_FILE_METAINFO_HEIGHT="Height"
169172
COM_QUANTUMMANAGER_FILE_METAINFO_MIMETYPE="MIME type"
170173
COM_QUANTUMMANAGER_FILE_METAINFO_SECTIONSFOUND="Section found"
171-
COM_QUANTUMMANAGER_FILE_METAINFO_SHOW="View all metadata"
172-
COM_QUANTUMMANAGER_FILE_METAINFO_HIDE="Hide metadata"
174+
COM_QUANTUMMANAGER_FILE_METAINFO_SHOW="View all Metadata"
175+
COM_QUANTUMMANAGER_FILE_METAINFO_HIDE="Hide Metadata"
173176
COM_QUANTUMMANAGER_FILE_METAINFO_SELECT_COUNT="Selected files"
174177
COM_QUANTUMMANAGER_FILE_METAINFO_SELECT_SIZE="File size"
175178

@@ -187,4 +190,4 @@ COM_QUANTUMMANAGER_HELP_COPYRIGHT_IMAGES="Actions, file types: I. Belov | <a hre
187190
COM_QUANTUMMANAGER_HELP_BUTTON_PRODUCT_PAGE="Product page"
188191
COM_QUANTUMMANAGER_HELP_BUTTON_DOCUMENTATION="Documentation"
189192
COM_QUANTUMMANAGER_HELP_BUTTON_SUPPORT="Support"
190-
COM_QUANTUMMANAGER_HELP_BUTTON_REVIEW="Review on the JED"
193+
COM_QUANTUMMANAGER_HELP_BUTTON_REVIEW="Reviews on the JED"

‎administrator/components/com_quantummanager/language/en-GB/en-GB.com_quantummanager.sys.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
; @link https://www.norrnext.com
66

77
COM_QUANTUMMANAGER="Quantum Manager"
8-
COM_QUANTUMMANAGER_XML_DESCRIPTION="File & media manager for Joomla!"
8+
COM_QUANTUMMANAGER_XML_DESCRIPTION="Quantum - file & media manager for Joomla!"

‎administrator/components/com_quantummanager/language/ru-RU/ru-RU.com_quantummanager.ini‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ COM_QUANTUMMANAGER_EMPTY_MIMETYPE="неизвестный mime тип"
1212

1313
COM_QUANTUMMANAGER_CONFIG_GENERAL="Общие настройки"
1414
COM_QUANTUMMANAGER_CONFIG_GENERAL_DESC="Это общие настройки для всего файлового менеджера"
15+
COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_LABEL="Документация"
16+
COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_DESC="Если у вас возникли сложности с настройкой менеджера, вы можете прочитать документацию по ссылке: <a href=\"https://www.norrnext.com/docs/joomla-extensions/quantum-manager\" target="_blank">https://www.norrnext.com/docs/joomla-extensions/quantum-manager</a><br /> <a href=\"https://www.norrnext.com/forum/quantum-manager-ru\" target=\"_blank\">Поддержка</a> | <a href=\"https://www.norrnext.com/quantum-manager\" target=\"_blank\">Страница продукта</a> | <a href=\"https://extensions.joomla.org/extension/quantum-manager/\" target=\"_blank\">Отзыв на JED</a>"
1517
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_LABEL="Стандартные области"
1618
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_NAME_LABEL="Название области"
1719
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_ENABLE_LABEL="Включить область"
1820
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_PATH_LABEL="Папка"
1921
COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_CUSTOM_LABEL="Свои области"
2022
COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_LABEL="Папка по умолчанию"
23+
COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_VARIABLES_LABEL="Переменные для путей"
2124
COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_DESC="Для полей путей областей доступны переменные: <br /><b>{user_id}</b> - ID текущего пользователя<br /><b>{year}</b> - текущий год<br /><b>{month}</b> - текущий месяц<br/><b>{day}</b> - текущий день<br/><b>{hours}</b> - текущий час<br/><b>{minutes}</b> - минуты<br/><b>{second}</b> - секунды<br/><b>{unix}</b> - время UNIX в секундах <br/><br/>Пример использования:<br/>images/{user_id}/{year}-{month}-{day}"
2225
COM_QUANTUMMANAGER_CONFIG_GENERAL_MAXSIZEFILENAME_LABEL="Максимальное кол-во символов в названии папок и файлов"
2326
COM_QUANTUMMANAGER_CONFIG_GENERAL_MAXSIZE_LABEL="Максимальный размер файла для загрузки <br /> в мегабайтах"
@@ -87,7 +90,7 @@ COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_EMPTY="Файлов нет."
8790
COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_BACK="Назад"
8891
COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_UP="Вверх"
8992
COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_UPLOAD="Загрузка"
90-
COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_CREATE_DIRECTORY="Создать папку"
93+
COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_CREATE_DIRECTORY="Создать"
9194
COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_WATERMARK="Водяной знак"
9295
COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_DELETE="Удалить"
9396
COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_EDIT="Редактировать"

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

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,6 @@
5454
</select>
5555
</label>
5656
</div>
57-
<div class="input-width-height-wrap">
58-
<label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_CROP'); ?></label>
59-
60-
<div>
61-
<label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_WIDTH'); ?></label>
62-
<div>
63-
<label>
64-
<input type="number" class="crop-width-value" disabled>
65-
</label>
66-
<span>PX</span>
67-
</div>
68-
</div>
69-
70-
<div>
71-
<label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_HEIGHT'); ?></label>
72-
<div>
73-
<label>
74-
<input type="number" class="crop-height-value" disabled>
75-
</label>
76-
<span>PX</span>
77-
</div>
78-
</div>
79-
</div>
8057
<div class="input-width-height-wrap">
8158
<label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_IMAGE'); ?></label>
8259

@@ -102,6 +79,7 @@
10279

10380
<label class="image-width-height-ratio-checkbox"><input type="checkbox" class="image-width-height-ratio" checked="checked"> <?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_LABEL_SAVE_RATIO'); ?></label>
10481
</div>
82+
10583
<div class="button-wrap btn-group">
10684
<button class="btn btn-save">
10785
<span><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_SAVE'); ?></span>
@@ -110,6 +88,33 @@
11088
<span><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_CLOSE'); ?></span>
11189
</button>
11290
</div>
91+
92+
<div class="input-width-height-wrap input-width-height-wrap-rows input-width-height-wrap-bottom">
93+
<label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_CROP'); ?></label>
94+
95+
<div>
96+
<label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_WIDTH'); ?>:</label>
97+
<div>
98+
<label>
99+
<!--<input type="number" class="crop-width-value" disabled>-->
100+
<span class="crop-width-value"></span>
101+
<span>PX</span>
102+
</label>
103+
</div>
104+
</div>
105+
106+
<div>
107+
<label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_HEIGHT'); ?>:</label>
108+
<div>
109+
<label>
110+
<!--<input type="number" class="crop-height-value" disabled>-->
111+
<span class="crop-height-value"></span>
112+
<span>PX</span>
113+
</label>
114+
115+
</div>
116+
</div>
117+
</div>
113118
</div>
114119
<div class="editor">
115120
<div class="cropperjs"></div>

‎administrator/components/com_quantummanager/views/quantummanager/tmpl/content.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
HTMLHelper::_('jquery.framework');
3434

3535
HTMLHelper::_('script', 'com_quantummanager/modalcontent.js', [
36-
//'version' => filemtime(__FILE__),
37-
'version' => rand(111111, 999999),
36+
'version' => filemtime(__FILE__),
3837
'relative' => true
3938
]);
4039

@@ -46,7 +45,9 @@
4645
JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
4746
JLoader::register('QuantummanagercontentHelper', JPATH_ROOT . '/plugins/editors-xtd/quantummanagercontent/helper.php');
4847

48+
QuantummanagercontentHelper::loadLang();
4949
$fieldsForContentPlugin = QuantummanagercontentHelper::getFieldsForScopes();
50+
$groups = Factory::getUser()->groups;
5051

5152
try {
5253

@@ -125,6 +126,7 @@
125126
catch (Exception $e) {
126127
echo $e->getMessage();
127128
}
129+
128130
?>
129131

130132

@@ -139,7 +141,11 @@
139141
'buttonInsert': '<?php echo Text::_('COM_QUANTUMMANAGER_WINDOW_INSERT'); ?>',
140142
'inputAlt': '<?php echo Text::_('COM_QUANTUMMANAGER_WINDOW_ALT'); ?>',
141143
'inputWidth': '<?php echo Text::_('COM_QUANTUMMANAGER_WINDOW_WIDTH'); ?>',
142-
'inputHeight': '<?php echo Text::_('COM_QUANTUMMANAGER_WINDOW_HEIGHT'); ?>',
144+
'defaultScope': '<?php echo Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_SCOPES_NAME_DEFAULT'); ?>',
145+
'defaultName': '<?php echo Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_SCOPES_DOCS_FIELDSFORM_NAME_NAME'); ?>',
146+
'defaultNameValue': '<?php echo Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_SCOPES_IMAGES_FIELDSFORM_DEFAULT_NAME'); ?>',
147+
'helpTemplate': '<?php echo Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_HELP_TEMPLATE'); ?>',
148+
'helpSettings': '<?php echo in_array('2', $groups) || in_array('8', $groups) ? Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_HELP_SETTINGS') : '' ?>',
143149
};
144150
</script>
145151

‎changelog.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1.2.1
1+
1.3
22
- [исправлено] ошибка показа метаинформации
33
- [исправлено] ошибка запуска менеджера, если джумла в подпапке
44
- [исправлено] ошибка что иногда не запускалось редактирование изображений
@@ -10,11 +10,12 @@
1010
- [исправлено] имена новых папок и загружаемых файлов по другому конвертируются, пример: "Привет Мир!" - получится "privet-mir"
1111
- [исправлено] переделано мультивыделение файлов, несколько выделяются областью, обычный клик это переключение файла
1212
- [исправлено] кеш превью картинок хранится теперь в папке cache и очищается при стандартной чистке кеша джумлы, папку "images/com_quantummanager" можно удалять, если такая имеется
13+
- [новое] добавлен плагин кнопки для редактора, который позволит вставлять файлы по разным шаблонам в редактор материалов
1314
- [новое] появилась кнопка наложить водяной знак и добавлена новая настройка выбора установки знака
1415
- [новое] новая настройка, которая позволит ограничить названия файлов загрузке
1516
- [новое] в контекстное меню для папок добавлено: переименование, удаление
1617
- [новое] добавлены области, их можно настроить в настройках менеджера
17-
- [новое] добавлена проверка на запись папки/файла
18+
- [новое] добавлена проверка на запись папки/файла
1819

1920
1.2
2021
- добавлена поддержка сервиса unsplash (фотостока)

‎media/com_quantummanager/css/configfields.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* @package quantummanager
3+
* @author Dmitry Tsymbal <[email protected]>
4+
* @copyright Copyright © 2019 Delo Design & NorrNext. All rights reserved.
5+
* @license GNU General Public License version 3 or later; see license.txt
6+
* @link https://www.norrnext.com
7+
*/
8+
19
.quantumconfig-quantumconfigpath-inputs {
210
display: flex;
311
align-items: center;

0 commit comments

Comments
 (0)