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

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -113,7 +113,16 @@ class BxBaseModGeneralModule extends BxDolModule
     public function serviceGetText ($iContentId)
     {
         $mixedResult = $this->_getFieldValue('FIELD_TEXT', $iContentId);
-        return $mixedResult !== false ? $mixedResult : '';
+        if (false === $mixedResult)
+            return '';
+
+        $CNF = &$this->_oConfig->CNF;
+        if (!empty($CNF['OBJECT_METATAGS']) && is_string($mixedResult)) {
+            $oMetatags = BxDolMetatags::getObjectInstance($CNF['OBJECT_METATAGS']);
+            $mixedResult = $oMetatags->metaParse($iContentId, $mixedResult);
+        }
+
+        return $mixedResult;
     }
 
     public function serviceGetInfo ($iContentId, $bSearchableFieldsOnly = true)

modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -17,6 +17,7 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
     protected $_sUnitClass;
     protected $_sUnitClassWithCover;
     protected $_sUnitClassWoInfo;
+	protected $_sUnitClassWoInfoShowCase;
     protected $_sUnitClassShowCase;
     
     function __construct(&$oConfig, &$oDb)

modules/boonex/glossary/install/sql/enable.sql

@@ -112,10 +112,11 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 -- PAGE: module home
 
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_glossary_home', 'glossary-home', '_bx_glossary_page_title_sys_home', '_bx_glossary_page_title_home', 'bx_glossary', 5, 2147483647, 1, 'page.php?i=glossary-home', '', '', '', 0, 1, 0, 'BxGlsrPageBrowse', 'modules/boonex/glossary/classes/BxGlsrPageBrowse.php');
+('bx_glossary_home', 'glossary-home', '_bx_glossary_page_title_sys_home', '_bx_glossary_page_title_home', 'bx_glossary', 2, 2147483647, 1, 'page.php?i=glossary-home', '', '', '', 0, 1, 0, 'BxGlsrPageBrowse', 'modules/boonex/glossary/classes/BxGlsrPageBrowse.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
-('bx_glossary_home', 1, 'bx_glossary', '', '_bx_glossary_page_block_title_featured_entries_view_alphabetical', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:11:"bx_glossary";s:6:"method";s:19:"browse_alphabetical";s:6:"params";a:1:{i:0;s:8:"extended";}}', 0, 1, 1, 0);
+('bx_glossary_home', 1, 'bx_glossary', '', '_bx_glossary_page_block_title_featured_entries_view_alphabetical', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:11:"bx_glossary";s:6:"method";s:19:"browse_alphabetical";s:6:"params";a:1:{i:0;s:8:"extended";}}', 0, 1, 1, 0),
+('bx_glossary_home', 2, 'bx_glossary', '', '_bx_glossary_page_block_title_cats', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"categories_list";s:6:"params";a:2:{i:0;s:16:"bx_glossary_cats";i:1;a:1:{s:10:"show_empty";b:1;}}s:5:"class";s:20:"TemplServiceCategory";}', 0, 1, 0, 1);
 
 -- PAGE: search for entries
 

modules/boonex/videos/template/unit.html

@@ -1,7 +1,7 @@
 <div class="bx-base-text-unit bx-base-text-unit-ext bx-def-box bx-def-round-corners bx-def-color-bg-box bx-def-margin-bottom">
     <bx_if:thumb>
         <div class="bx-base-text-unit-cover">
-            <img class="bx-base-text-unit-cover bx-def-round-corners" alt="__title__" src="__thumb_url__" />
+            <a href="__content_url__"><img class="bx-base-text-unit-cover bx-def-round-corners" alt="__title__" src="__thumb_url__" /></a>
             <div class="bx-video-unit-duration bx-def-padding-sec-leftright bx-def-padding-thd-topbottom bx-def-border bx-def-round-corners bx-def-font">__duration__</div>
         </div>
     </bx_if:thumb>

modules/boonex/videos/template/unit_full.html

@@ -1,7 +1,7 @@
 <div class="bx-base-text-unit bx-base-text-unit-ext bx-def-margin-bottom">
     <bx_if:thumb>
         <div class="bx-base-text-unit-cover">
-            <img class="bx-base-text-unit-cover bx-def-round-corners" alt="__title__" src="__thumb_url__" />
+            <a href="__content_url__"><img class="bx-base-text-unit-cover bx-def-round-corners" alt="__title__" src="__thumb_url__" /></a>
             <div class="bx-video-unit-duration bx-def-padding-sec-leftright bx-def-padding-thd-topbottom bx-def-border bx-def-round-corners bx-def-font">__duration__</div>
         </div>
     </bx_if:thumb>

template/scripts/BxBaseFormView.php

@@ -1483,6 +1483,7 @@ BLAH;
                 'timepicker-addon/jquery-ui-timepicker-addon.min.js',
                 'timepicker-addon/jquery-ui-sliderAccess.js',
                 'timepicker-addon/i18n/jquery-ui-timepicker-' . $sCalendarLang . '.js',
+                'jquery.ui.touch-punch.min.js',
             );
 
             foreach ($this->aInputs as $aInput) {