Merge branch 'master' of https://github.com/unaio/una

inc/classes/BxDolProfileUndefined.php

@@ -116,6 +116,14 @@ class BxDolProfileUndefined extends BxDolFactory implements iBxDolSingleton, iBx
             'title' => $this->getDisplayName()
         ), $aTemplateVars));
     }
+    
+    /**
+     * Get badges
+     */
+    public function getBadges()
+    {
+        return "";
+    }
 
     /**
      * Check whether a profile has real image uploaded by user.

install/sql/system.sql

@@ -4038,7 +4038,7 @@ INSERT INTO `sys_objects_grid` (`object`, `source_type`, `source`, `table`, `fie
 ('sys_studio_search_forms', 'Sql', 'SELECT * FROM `sys_objects_search_extended` WHERE 1 ', 'sys_objects_search_extended', 'id', 'module,title', 'active', '', 100, NULL, 'start', '', 'module', 'title', 'like', 'module', 'title', 'BxTemplStudioFormsSearchForms', ''),
 ('sys_studio_search_forms_fields', 'Sql', 'SELECT * FROM `sys_search_extended_fields` WHERE 1 AND `object`=?', 'sys_search_extended_fields', 'id', 'order', 'active', '', 100, NULL, 'start', '', 'type', 'caption', 'like', '', '', 'BxTemplStudioFormsSearchFields', ''),
 
-('sys_studio_labels', 'Sql', 'SELECT * FROM `sys_labels` WHERE 1 ', 'sys_labels', 'id', 'order', '', '', 100, NULL, 'start', '', 'value', '', 'like', 'value', '', 'BxTemplStudioFormsLabels', ''),
+('sys_studio_labels', 'Sql', 'SELECT * FROM `sys_labels` WHERE 1 ', 'sys_labels', 'id', 'order', '', '', 1000, NULL, 'start', '', 'value', '', 'like', 'value', '', 'BxTemplStudioFormsLabels', ''),
 ('sys_studio_categories', 'Sql', 'SELECT * FROM `sys_categories` WHERE 1 ', 'sys_categories', 'id', 'added', 'status', '', 20, NULL, 'start', '', 'value', '', 'like', '', '', 'BxTemplStudioFormsCategories', ''),
 
 ('sys_audit_administration', 'Sql', 'SELECT * FROM `sys_audit` WHERE 1 ', 'sys_audit', 'id', 'added', '', '', 20, NULL, 'start', '', 'value', '', 'like', '', '', 'BxTemplAuditGrid', ''),

modules/boonex/events/install/langs/en.xml

@@ -129,9 +129,9 @@
     <string name="_bx_events_page_block_title_entries_actions"><![CDATA[Events actions]]></string>
     <string name="_bx_events_page_block_title_entries_in_context"><![CDATA[Events in <a href="{profile_link}">{display_name}</a>]]></string>
     <string name="_bx_events_page_block_title_sys_entries_in_context"><![CDATA[Events in context]]></string>
-    <string name="_bx_events_page_block_title_calendar_in_context"><![CDATA[Calendar events in <a href="{profile_link}">{display_name}</a>]]></string>
-    <string name="_bx_events_page_block_title_sys_calendar_in_context"><![CDATA[Calendar events in context]]></string>
-    <string name="_bx_events_page_block_title_calendar_for_context"><![CDATA[Calendar events in context]]></string>
+    <string name="_bx_events_page_block_title_calendar_in_context"><![CDATA[Events Calendar in <a href="{profile_link}">{display_name}</a>]]></string>
+    <string name="_bx_events_page_block_title_sys_calendar_in_context"><![CDATA[Events Calendar in context]]></string>
+    <string name="_bx_events_page_block_title_calendar_for_context"><![CDATA[Events Calendar in context]]></string>
     <string name="_bx_events_page_block_title_browse_for_context"><![CDATA[Events in context]]></string>
     <string name="_bx_events_page_block_title_sys_entries_of_author"><![CDATA[Events of author]]></string>
     <string name="_bx_events_page_block_title_entries_of_author"><![CDATA[Events by {display_name}]]></string>

modules/boonex/froala/install/sql/enable.sql

@@ -12,7 +12,7 @@ SET @iCategId = LAST_INSERT_ID();
 
 INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
 ('bx_froala_icons_template', 'svg', @iCategId, '_bx_froala_option_icons_template', 'select', 'svg,font_awesome_5,text', '', '', 5),
-('bx_froala_option_plugins', 'emoticons,embedly,draggable,fullscreen,image,link,html', @iCategId, '_bx_froala_option_plugins', 'digit', '', '', '', 10),
+('bx_froala_option_plugins', 'emoticons,embedly,draggable,fullscreen,image,link', @iCategId, '_bx_froala_option_plugins', 'digit', '', '', '', 10),
 
 ('bx_froala_option_toolbar_mini', "{'moreText': {'buttons': ['bold', 'italic', 'underline','quote'],'buttonsVisible': 2},'moreRich': {'buttons': ['insertLink', 'insertImage','emoticons', 'embedly'],'buttonsVisible': 2},'moreMisc': {'buttons': ['undo', 'redo', 'fullscreen'],'align': 'right','buttonsVisible': 0}}", @iCategId, '_bx_froala_option_toolbar_mini', 'digit', '', '', '', 20),
 ('bx_froala_option_toolbar_mini_mobile', "{'moreText': {'buttons': ['bold', 'italic', 'underline','quote'],'buttonsVisible': 0},'moreRich': {'buttons': ['insertLink', 'insertImage','emoticons', 'embedly'],'buttonsVisible': 0},'moreMisc': {'buttons': ['undo', 'redo', 'fullscreen'],'align': 'right','buttonsVisible': 0}}", @iCategId, '_bx_froala_option_toolbar_mini_mobile', 'digit', '', '', '', 21),

modules/boonex/wiki/template/images/icons/std-icon.svg

@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="606px" height="606px" viewBox="0 0 606 606" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#4f9865" stop-opacity="1" offset="0%"></stop>
-            <stop stop-color="#1c6935" stop-opacity="1" offset="100%"></stop>
-        </linearGradient>
-        <path d="M552.268958,552.268958 C600,504.537813 600,431.458333 600,300 C600,168.541667 600,95.4621875 552.268958,47.7310417 C504.537813,0 431.458333,0 300,0 C168.541667,0 95.4621875,0 47.7310417,47.7310417 C0,95.4621875 0,168.541667 0,300 C0,431.458333 0,504.537813 47.7310417,552.268958 C95.4621875,600 168.541667,600 300,600 C431.458333,600 504.537813,600 552.268958,552.268958 Z" id="path-2"></path>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="una-connect" transform="translate(3.000000, 3.000000)">
-            <g id="Squircle2-Copy-6">
-                <g id="Shape">
-                    <use fill="#FFFFFF" xlink:href="#path-2"></use>
-                    <use stroke="#000000" stroke-width="4.04" fill="url(#linearGradient-1)" xlink:href="#path-2"></use>
-                </g>
-            </g>
-            <g>
-                <text x="50%" y="58%" style="text-anchor: middle; fill: #ffffff; stroke: #000000; font-size: 180px;">
-                    WIKI
-                </text>
-            </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="discussions">
+        <path id="Path" d="M32,64C46.022,64 53.817,64 58.909,58.909C64,53.817 64,46.022 64,32C64,17.978 64,10.183 58.909,5.091C53.817,0 46.022,0 32,0C17.978,0 10.183,0 5.091,5.091C0,10.183 0,17.978 0,32C0,46.022 0,53.817 5.091,58.909C10.183,64 17.978,64 32,64Z" style="fill:rgb(187,41,187);"/>
+        <g transform="matrix(0.0937502,0,0,0.089844,14,8.99993)">
+            <path d="M384,128L272,128C263.223,128 256,120.777 256,112L256,0L24,0C23.98,0 23.96,0 23.94,0C10.829,0 0.033,10.77 0,23.88L0,488C0,488.02 0,488.04 0,488.06C0,501.171 10.77,511.967 23.88,512L360,512C360.02,512 360.04,512 360.06,512C373.171,512 383.967,501.23 384,488.12L384,128Z" style="fill:white;fill-opacity:0.6;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.0937502,0,0,0.089844,14,8.99993)">
+            <path d="M352,83.478L256,0L24,0C23.98,0 23.96,0 23.94,0C10.829,0 0.033,10.77 0,23.88L0,488C0,488.02 0,488.04 0,488.06C0,501.171 10.77,511.967 23.88,512L352,83.478Z" style="fill:white;fill-opacity:0.4;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.0937502,0,0,0.089844,14,8.99993)">
+            <path d="M330.667,61.218L256,0L24,0C23.98,0 23.96,0 23.94,0C10.829,0 0.033,10.77 0,23.88L0,488C0,488.02 0,349.72 0,349.74C0,362.85 330.667,61.218 330.667,61.218Z" style="fill:white;fill-opacity:0.4;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.0937502,0,0,0.089844,14,8.99993)">
+            <path d="M330.667,61.218L256,0L24,0C23.98,0 23.96,0 23.94,0C10.829,0 0.033,10.77 0,23.88L0,488C0,488.02 0,192.363 0,192.383C0,205.494 330.667,61.218 330.667,61.218Z" style="fill:white;fill-opacity:0.4;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.111365,0,0,0.106725,10.816,-1.00007)">
+            <path d="M305,256L281.1,256C275.491,255.952 270.611,259.982 269.6,265.5C245.4,376.9 247.8,383.5 248,394.7C247.2,389.3 242.4,365.7 218.4,265.3C217.107,259.911 212.241,256.086 206.7,256.1L177.6,256.1C172.076,256.038 167.2,259.83 165.9,265.2C143.8,355.2 138.1,377.7 136.5,387.9C135.6,375.2 131.1,343.7 115.5,265.7C114.402,260.079 109.427,255.989 103.7,256L79.2,256C72.623,256.008 67.215,261.423 67.215,268C67.215,268.874 67.311,269.746 67.5,270.6L105.3,438.6C106.513,444.067 111.4,447.993 117,448L154.1,448C159.576,447.98 164.377,444.214 165.7,438.9C188.9,345.8 190.2,342.7 191.3,328.4L191.8,328.4C196.6,357.7 191.6,335.4 217.4,438.9C218.723,444.214 223.524,447.98 229,448L267,448C272.583,448.041 277.48,444.148 278.7,438.7L316.7,270.7C316.904,269.815 317.004,268.909 317,268C317,261.417 311.583,256 305,256Z" style="fill:rgb(187,41,187);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.0937502,0,0,0.089844,14,8.99993)">
+            <path d="M377,105L279.1,7C274.589,2.504 268.469,-0.016 262.1,0L256,0L256,112C256,120.777 263.223,128 272,128L384,128L384,121.9C384,115.564 381.48,109.48 377,105Z" style="fill:white;fill-rule:nonzero;"/>
         </g>
     </g>
 </svg>

studio/template/images/icons/wi-audit.svg

@@ -1,37 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#738088;}
-	.st1{fill:#FFFFFF;}
-</style>
-<title>developer</title>
-<desc>Created with Sketch.</desc>
-<g id="Page-1">
-	<g id="Artboard" transform="translate(-340.000000, -184.000000)">
-		<g id="developer" transform="translate(340.000000, 184.000000)">
-			<g id="Path">
-				<path id="path-1_1_" class="st0" d="M32,64c14,0,21.8,0,26.9-5.1C64,53.8,64,46,64,32s0-21.8-5.1-26.9C53.8,0,46,0,32,0
-					S10.2,0,5.1,5.1C0,10.2,0,18,0,32s0,21.8,5.1,26.9C10.2,64,18,64,32,64z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<path class="st1" d="M39.4,8.1C30.4,8.1,23,15.5,23,24.6c0,3.7,1.3,7.2,3.4,10L23,37.9c0,0,0,0-0.1,0.1c-0.3-0.1-0.6-0.1-0.8-0.1
-		c-1.1,0-2.1,0.4-2.9,1.2L9.3,49c-0.8,0.8-1.2,1.8-1.2,2.9s0.4,2.1,1.2,2.9c0.8,0.8,1.8,1.2,2.9,1.2s2.1-0.4,2.9-1.2l9.9-9.9
-		c0.8-0.8,1.2-1.8,1.2-2.9c0-0.3,0-0.6-0.1-0.8c0,0,0,0,0.1-0.1l3.3-3.3c2.8,2.1,6.2,3.4,10,3.4c9.1,0,16.5-7.4,16.5-16.5
-		S48.5,8.1,39.4,8.1z M13.9,53.6c-0.5,0.5-1.1,0.7-1.8,0.7c-0.7,0-1.3-0.3-1.8-0.7c-0.5-0.5-0.7-1.1-0.7-1.8s0.3-1.3,0.7-1.8l9-9
-		l3.6,3.6L13.9,53.6z M24,43.6L20.4,40c0.5-0.4,1.1-0.6,1.6-0.6c0.6,0,1.3,0.2,1.8,0.7c0.5,0.5,0.7,1.1,0.7,1.8
-		C24.6,42.5,24.4,43.1,24,43.6z M25.4,39.6c-0.1-0.2-0.3-0.4-0.4-0.5c-0.2-0.2-0.3-0.3-0.5-0.4l2.9-2.9c0.3,0.3,0.6,0.7,1,1
-		L25.4,39.6z M39.4,39.5c-8.2,0-14.9-6.7-14.9-14.9S31.2,9.6,39.4,9.6s14.9,6.7,14.9,14.9S47.7,39.5,39.4,39.5z"/>
-	<path class="st1" d="M39.4,11.4c-7.3,0-13.2,5.9-13.2,13.2s5.9,13.2,13.2,13.2s13.2-5.9,13.2-13.2S46.7,11.4,39.4,11.4z M39.4,36.2
-		c-6.4,0-11.6-5.2-11.6-11.6S33,12.9,39.4,12.9s11.6,5.2,11.6,11.6S45.9,36.2,39.4,36.2z"/>
-	<path class="st1" d="M44.8,16.3c-0.4-0.2-0.8-0.1-1.1,0.2c-0.2,0.4-0.1,0.8,0.2,1.1c2.4,1.5,3.8,4.2,3.8,7c0,1.9-0.7,3.8-1.9,5.3
-		c-0.3,0.3-0.2,0.8,0.1,1.1c0.1,0.1,0.3,0.2,0.5,0.2c0.2,0,0.4-0.1,0.6-0.3c1.5-1.8,2.3-4,2.3-6.3C49.3,21.2,47.6,18.1,44.8,16.3z"
-		/>
-	<path class="st1" d="M41.2,14.8c-0.6-0.1-1.2-0.2-1.8-0.2c-0.4,0-0.8,0.3-0.8,0.8s0.3,0.8,0.8,0.8c0.5,0,1,0,1.5,0.1
-		c0,0,0.1,0,0.1,0c0.4,0,0.7-0.3,0.8-0.6C41.9,15.3,41.7,14.9,41.2,14.8z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g id="discussions">
+        <path id="Path" d="M32,64C46.022,64 54.384,64.509 58.909,58.909C63.649,53.041 63.471,44.852 64,32C64.576,17.99 64,10.183 58.909,5.091C53.817,0 46.022,0 32,0C17.978,0 10.183,0 5.091,5.091C0,10.183 0,17.978 0,32C0,46.022 0,53.817 5.091,58.909C10.183,64 17.978,64 32,64Z" style="fill:rgb(253,59,56);"/>
+        <g transform="matrix(0.0906011,0,0,0.0906011,8.8061,8.8061)">
+            <path d="M141.68,400.23C174.188,425.985 214.468,440.008 255.943,440.008C356.882,440.008 439.943,356.947 439.943,256.008C439.943,155.068 356.882,72.008 255.943,72.008C209.131,72.008 164.04,89.871 129.93,121.93L180.69,172.69C190.77,182.77 183.63,200 169.37,200L24,200C15.223,200 8,192.777 8,184L8,38.63C8,24.37 25.23,17.23 35.31,27.31L84.69,76.69C130.764,32.545 192.191,7.915 256,8C392.81,8 503.75,118.78 504,255.53C504.25,392.28 392.82,503.9 256.18,504C199.489,504.125 144.448,484.729 100.36,449.09C94.749,444.536 91.485,437.683 91.485,430.456C91.485,424.091 94.018,417.98 98.52,413.48L109.79,402.21C118.33,393.584 132.138,392.727 141.68,400.23Z" style="fill:white;fill-opacity:0.49;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.0906011,0,0,0.0906011,8.8061,8.8061)">
+            <path d="M504,255.53C504.25,370.205 344.853,415.634 344.242,417.933C344.147,418.29 439.943,367.985 439.943,256.008C439.943,155.068 356.882,72.008 255.943,72.008C209.131,72.008 164.04,89.871 129.93,121.93L180.69,172.69C190.77,182.77 183.63,200 169.37,200L24,200C15.223,200 8,192.777 8,184L8,38.63C8,24.37 25.23,17.23 35.31,27.31L84.69,76.69C130.764,32.545 192.191,7.915 256,8C392.81,8 503.702,118.78 504,255.53Z" style="fill:white;fill-opacity:0.2;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.0906011,0,0,0.0906011,8.8061,8.8061)">
+            <path d="M458.837,113.186C487.992,193.02 439.943,257.611 439.943,256.008C439.943,155.068 356.882,72.008 255.943,72.008C209.131,72.008 164.04,89.871 129.93,121.93L180.69,172.69C190.77,182.77 183.63,200 169.37,200L24,200C15.223,200 8,192.777 8,184L8,38.63C8,24.37 25.23,17.23 35.31,27.31L84.69,76.69C130.764,32.545 192.191,7.915 256,8C392.81,8 457.181,108.651 458.837,113.186Z" style="fill:white;fill-opacity:0.2;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.0906011,0,0,0.0906011,8.8061,8.8061)">
+            <path d="M256,8C392.81,8 418.545,169.161 417.868,167.709C406.83,144.031 356.882,72.008 255.943,72.008C209.131,72.008 164.04,89.871 129.93,121.93L180.69,172.69C190.77,182.77 183.63,200 169.37,200L24,200C15.223,200 8,192.777 8,184L8,38.63C8,24.37 25.23,17.23 35.31,27.31L84.69,76.69C130.764,32.545 192.191,7.915 256,8Z" style="fill:white;fill-opacity:0.33;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(0.0906011,0,0,0.0906011,8.8061,8.8061)">
+            <path d="M288,152L288,256.35L328.7,288C334.542,292.544 337.966,299.544 337.966,306.945C337.966,312.281 336.186,317.468 332.91,321.68L323.09,334.3C318.546,340.142 311.546,343.566 304.145,343.566C298.809,343.566 293.622,341.786 289.41,338.51L224,287.65L224,152C224,138.834 234.834,128 248,128L264,128C277.166,128 288,138.834 288,152Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+    </g>
 </svg>

studio/template/scripts/BxBaseStudioBadgesGrid.php

@@ -335,7 +335,7 @@ class BxBaseStudioBadgesGrid extends BxDolStudioBadgesGrid
                     'caption' => _t('_adm_form_txt_badges_text'),
                     'info' => '',
                     'value' => isset($aBadge['text']) ? $aBadge['text'] : '',
-                    'required' => '1',
+                    'required' => '0',
                     'db' => array (
                         'pass' => 'Xss',
                     )
@@ -346,7 +346,7 @@ class BxBaseStudioBadgesGrid extends BxDolStudioBadgesGrid
                     'caption' => _t('_adm_form_txt_badges_color'),
                     'info' => '',
                     'value' => isset($aBadge['color']) ? $aBadge['color'] : '',
-                    'required' => '1',
+                    'required' => '0',
                     'db' => array (
                         'pass' => 'Xss',
                     )
@@ -369,7 +369,7 @@ class BxBaseStudioBadgesGrid extends BxDolStudioBadgesGrid
                     'caption' => _t('_adm_form_txt_badges_icon'),
                     'info' => _t('_adm_form_dsc_badges_icon'),
                     'value' => '',
-                    'required' => '1',
+                    'required' => '0',
                     'db' => array (
                         'pass' => 'Xss',
                     )