Исправления к 1.3

administrator/components/com_quantummanager/config.xml

@@ -3,10 +3,16 @@
 
 	<fieldset name="general" label="COM_QUANTUMMANAGER_CONFIG_GENERAL" description="COM_QUANTUMMANAGER_CONFIG_GENERAL_DESC">
 
-		<field type="quantumconfigdescription"
-			   label=""
-			   fromText="COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_DESC"
-			   addfieldpath="/administrator/components/com_quantummanager/fields"
+		<field type="note"
+			   label="COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_LABEL"
+			   description="COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_DESC"
+			   class="alert alert-info"
+		/>
+
+		<field type="note"
+			   label="COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_VARIABLES_LABEL"
+			   description="COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_DESC"
+			   class="alert alert-info"
 		/>
 
 		<field name="scopes"

administrator/components/com_quantummanager/helpers/image.php

@@ -93,8 +93,6 @@ public function resizeWatermark($file)
 				$logoHeight = imagesy($logo);
 				$imageWidth = imagesx($fileString);
 				$imageHeight = imagesy($fileString);
-				$imageX = $padding;
-				$imageY = $padding;
 
 				if((int)$this->paramsComponent->get('overlaypercent', 0))
 				{
@@ -129,7 +127,7 @@ public function resizeWatermark($file)
 				}
 
 				$watermark = $manager->make($logo);
-				$image->insert($watermark, $position);
+				$image->insert($watermark, $position, $padding, $padding);
 
 				$image->save($file);
 

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

@@ -13,12 +13,15 @@ COM_QUANTUMMANAGER_EMPTY_MIMETYPE="Unknown mime type"
 
 COM_QUANTUMMANAGER_CONFIG_GENERAL="Global settings"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_DESC="Here are global settings for entire file manager"
+COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_LABEL="Documentation"
+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>"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_LABEL="Default scopes"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_NAME_LABEL="Name scope"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_ENABLE_LABEL="Enable scope"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_PATH_LABEL="Folder"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_CUSTOM_LABEL="Custom scopes"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_LABEL="Default folder"
+COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_VARIABLES_LABEL="Path variables"
 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}"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_MAXSIZEFILENAME_LABEL="Maximum length of file or folder name"
 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"
 COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_LABEL_SAVE_RATIO="Save ratio"
 
 COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_BUTTON="Search in Unsplash"
-COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_NOTFOUND="Nothing found, try asking differently."
+COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_NOTFOUND="Nothing found, try another search request."
 COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_BUTTON_LOAD="Load more"
 COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_SAVE="Save"
 COM_QUANTUMMANAGER_FIELDS_QUANTUMUNSPLASH_CLOSE="Close"
@@ -168,8 +171,8 @@ COM_QUANTUMMANAGER_FILE_METAINFO_WIDTH="Width"
 COM_QUANTUMMANAGER_FILE_METAINFO_HEIGHT="Height"
 COM_QUANTUMMANAGER_FILE_METAINFO_MIMETYPE="MIME type"
 COM_QUANTUMMANAGER_FILE_METAINFO_SECTIONSFOUND="Section found"
-COM_QUANTUMMANAGER_FILE_METAINFO_SHOW="View all metadata"
-COM_QUANTUMMANAGER_FILE_METAINFO_HIDE="Hide metadata"
+COM_QUANTUMMANAGER_FILE_METAINFO_SHOW="View all Metadata"
+COM_QUANTUMMANAGER_FILE_METAINFO_HIDE="Hide Metadata"
 COM_QUANTUMMANAGER_FILE_METAINFO_SELECT_COUNT="Selected files"
 COM_QUANTUMMANAGER_FILE_METAINFO_SELECT_SIZE="File size"
 
@@ -187,4 +190,4 @@ COM_QUANTUMMANAGER_HELP_COPYRIGHT_IMAGES="Actions, file types: I. Belov | <a hre
 COM_QUANTUMMANAGER_HELP_BUTTON_PRODUCT_PAGE="Product page"
 COM_QUANTUMMANAGER_HELP_BUTTON_DOCUMENTATION="Documentation"
 COM_QUANTUMMANAGER_HELP_BUTTON_SUPPORT="Support"
-COM_QUANTUMMANAGER_HELP_BUTTON_REVIEW="Review on the JED"
+COM_QUANTUMMANAGER_HELP_BUTTON_REVIEW="Reviews on the JED"

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

@@ -5,4 +5,4 @@
 ; @link       https://www.norrnext.com
 
 COM_QUANTUMMANAGER="Quantum Manager"
-COM_QUANTUMMANAGER_XML_DESCRIPTION="File & media manager for Joomla!"
+COM_QUANTUMMANAGER_XML_DESCRIPTION="Quantum - file & media manager for Joomla!"

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

@@ -12,12 +12,15 @@ COM_QUANTUMMANAGER_EMPTY_MIMETYPE="неизвестный mime тип"
 
 COM_QUANTUMMANAGER_CONFIG_GENERAL="Общие настройки"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_DESC="Это общие настройки для всего файлового менеджера"
+COM_QUANTUMMANAGER_CONFIG_GENERAL_DOCS_LABEL="Документация"
+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>"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_LABEL="Стандартные области"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_NAME_LABEL="Название области"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_ENABLE_LABEL="Включить область"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_PATH_LABEL="Папка"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_SCOPES_CUSTOM_LABEL="Свои области"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_LABEL="Папка по умолчанию"
+COM_QUANTUMMANAGER_CONFIG_GENERAL_PATH_VARIABLES_LABEL="Переменные для путей"
 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}"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_MAXSIZEFILENAME_LABEL="Максимальное кол-во символов в названии папок и файлов"
 COM_QUANTUMMANAGER_CONFIG_GENERAL_MAXSIZE_LABEL="Максимальный размер файла для загрузки <br /> в мегабайтах"
@@ -87,7 +90,7 @@ COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_EMPTY="Файлов нет."
 COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_BACK="Назад"
 COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_UP="Вверх"
 COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_UPLOAD="Загрузка"
-COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_CREATE_DIRECTORY="Создать папку"
+COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_CREATE_DIRECTORY="Создать"
 COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_WATERMARK="Водяной знак"
 COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_DELETE="Удалить"
 COM_QUANTUMMANAGER_FIELDS_QUANTUMVIEWFILES_BUTTON_EDIT="Редактировать"

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

@@ -54,29 +54,6 @@
 		        </select>
 	        </label>
         </div>
-        <div class="input-width-height-wrap">
-            <label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_CROP'); ?></label>
-
-            <div>
-                <label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_WIDTH'); ?></label>
-                <div>
-	                <label>
-		                <input type="number" class="crop-width-value" disabled>
-	                </label>
-	                <span>PX</span>
-                </div>
-            </div>
-
-            <div>
-                <label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_HEIGHT'); ?></label>
-                <div>
-	                <label>
-		                <input type="number" class="crop-height-value" disabled>
-	                </label>
-	                <span>PX</span>
-                </div>
-            </div>
-        </div>
         <div class="input-width-height-wrap">
             <label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_IMAGE'); ?></label>
 
@@ -102,6 +79,7 @@
 
             <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>
         </div>
+
         <div class="button-wrap btn-group">
             <button class="btn btn-save">
                 <span><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_SAVE'); ?></span>
@@ -110,6 +88,33 @@
                 <span><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_CLOSE'); ?></span>
             </button>
         </div>
+
+        <div class="input-width-height-wrap input-width-height-wrap-rows input-width-height-wrap-bottom">
+            <label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_CROP'); ?></label>
+
+            <div>
+                <label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_WIDTH'); ?>:</label>
+                <div>
+                    <label>
+                        <!--<input type="number" class="crop-width-value" disabled>-->
+                        <span class="crop-width-value"></span>
+                        <span>PX</span>
+                    </label>
+                </div>
+            </div>
+
+            <div>
+                <label><?php echo Text::_('COM_QUANTUMMANAGER_FIELDS_QUANTUMCROPPERJS_TOOLTIP_HEIGHT'); ?>:</label>
+                <div>
+                    <label>
+                        <!--<input type="number" class="crop-height-value" disabled>-->
+                        <span class="crop-height-value"></span>
+                        <span>PX</span>
+                    </label>
+
+                </div>
+            </div>
+        </div>
     </div>
     <div class="editor">
         <div class="cropperjs"></div>

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

@@ -33,8 +33,7 @@
 HTMLHelper::_('jquery.framework');
 
 HTMLHelper::_('script', 'com_quantummanager/modalcontent.js', [
-	//'version' => filemtime(__FILE__),
-	'version' => rand(111111, 999999),
+	'version' => filemtime(__FILE__),
 	'relative' => true
 ]);
 
@@ -46,7 +45,9 @@
     JLoader::register('QuantummanagerHelper', JPATH_SITE . '/administrator/components/com_quantummanager/helpers/quantummanager.php');
     JLoader::register('QuantummanagercontentHelper', JPATH_ROOT . '/plugins/editors-xtd/quantummanagercontent/helper.php');
 
+    QuantummanagercontentHelper::loadLang();
     $fieldsForContentPlugin = QuantummanagercontentHelper::getFieldsForScopes();
+    $groups = Factory::getUser()->groups;
 
 	try {
 
@@ -125,6 +126,7 @@
 	catch (Exception $e) {
 		echo $e->getMessage();
 	}
+
 ?>
 
 
@@ -139,7 +141,11 @@
         'buttonInsert': '<?php echo Text::_('COM_QUANTUMMANAGER_WINDOW_INSERT'); ?>',
         'inputAlt': '<?php echo Text::_('COM_QUANTUMMANAGER_WINDOW_ALT'); ?>',
         'inputWidth': '<?php echo Text::_('COM_QUANTUMMANAGER_WINDOW_WIDTH'); ?>',
-        'inputHeight': '<?php echo Text::_('COM_QUANTUMMANAGER_WINDOW_HEIGHT'); ?>',
+        'defaultScope': '<?php echo Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_SCOPES_NAME_DEFAULT'); ?>',
+        'defaultName': '<?php echo Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_SCOPES_DOCS_FIELDSFORM_NAME_NAME'); ?>',
+        'defaultNameValue': '<?php echo Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_SCOPES_IMAGES_FIELDSFORM_DEFAULT_NAME'); ?>',
+        'helpTemplate': '<?php echo Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_HELP_TEMPLATE'); ?>',
+        'helpSettings': '<?php echo in_array('2', $groups) || in_array('8', $groups) ? Text::_('PLG_BUTTON_QUANTUMMANAGERCONTENT_HELP_SETTINGS') : '' ?>',
     };
 </script>
 

changelog.md

@@ -1,4 +1,4 @@
-1.2.1
+1.3
 - [исправлено] ошибка показа метаинформации
 - [исправлено] ошибка запуска менеджера, если джумла в подпапке
 - [исправлено] ошибка что иногда не запускалось редактирование изображений
@@ -10,11 +10,12 @@
 - [исправлено] имена новых папок и загружаемых файлов по другому конвертируются, пример: "Привет Мир!" - получится "privet-mir"
 - [исправлено] переделано мультивыделение файлов, несколько выделяются областью, обычный клик это переключение файла
 - [исправлено] кеш превью картинок хранится теперь в папке cache и очищается при стандартной чистке кеша джумлы, папку "images/com_quantummanager" можно удалять, если такая имеется
+- [новое] добавлен плагин кнопки для редактора, который позволит вставлять файлы по разным шаблонам в редактор материалов
 - [новое] появилась кнопка наложить водяной знак и добавлена новая настройка выбора установки знака
 - [новое] новая настройка, которая позволит ограничить названия файлов загрузке
 - [новое] в контекстное меню для папок добавлено: переименование, удаление
 - [новое] добавлены области, их можно настроить в настройках менеджера
-- [новое] добавлена проверка на запись папки/файла
+- [новое] добавлена проверка на запись папки/файла 
 
 1.2
 - добавлена поддержка сервиса unsplash (фотостока)

media/com_quantummanager/css/configfields.css

@@ -1,3 +1,11 @@
+/**
+ * @package    quantummanager
+ * @author     Dmitry Tsymbal <cymbal@delo-design.ru>
+ * @copyright  Copyright © 2019 Delo Design & NorrNext. All rights reserved.
+ * @license    GNU General Public License version 3 or later; see license.txt
+ * @link       https://www.norrnext.com
+ */
+
 .quantumconfig-quantumconfigpath-inputs {
     display: flex;
     align-items: center;

media/com_quantummanager/css/contextual.css

@@ -1,3 +1,11 @@
+/**
+ * @package    quantummanager
+ * @author     Dmitry Tsymbal <cymbal@delo-design.ru>
+ * @copyright  Copyright © 2019 Delo Design & NorrNext. All rights reserved.
+ * @license    GNU General Public License version 3 or later; see license.txt
+ * @link       https://www.norrnext.com
+ */
+
 .contextualMenu {
     font-size: 13px;
     position: absolute;

media/com_quantummanager/css/modal.css

@@ -19,6 +19,10 @@ body {
     height: 100% !important;
 }
 
+#system-message-container {
+    padding: 0 !important;
+}
+
 .quantummanager {
     width: 100%;
     height: 100vh !important;
@@ -48,6 +52,15 @@ body {
     padding: 10px 0;
 }
 
+.modal-form-insert-footer {
+    display: block !important;
+    padding: 0 0 5px 0 !important;
+    text-align: center;
+    justify-content: center !important;
+    font-size: 12px;
+    line-height: 14px;
+}
+
 .modal-form-insert > div > input {
     display: inline-block;
     width: 29%;

media/com_quantummanager/css/quantumcropperjs.css

@@ -220,6 +220,11 @@
     justify-content: space-between;
     margin-top: 25px;
 }
+
+.input-width-height-wrap-bottom {
+    position: absolute;
+    bottom: 25px
+}
 .quantumcropperjs-module .input-width-height-wrap > label {
     width: 100%;
     color: #cbcbcb;
@@ -259,6 +264,16 @@
     margin: 0;
     margin-right: 5px;
 }
+.input-width-height-wrap-rows > div {
+    display: flex;
+    align-items: center;
+}
+.input-width-height-wrap-rows > div > label {
+    margin-right: 5px !important;
+}
+.input-width-height-wrap-rows > div label {
+    margin-bottom: 0 !important;
+}
 .quantumcropperjs-module .button-wrap {
     margin-top: 35px;
     justify-content: center;

media/com_quantummanager/css/quantumunsplash.css

@@ -251,7 +251,7 @@
 
 }
 
-@media screen and (max-width: 800px) {
+@media screen and (max-width: 1425px) {
     .quantumunsplash-module .quantumunsplash-module-container .quantumunsplash-module-close {
         position: absolute;
         top: 8px;