Browse Source

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

RomanL 7 years ago
parent
commit
07c474f958

+ 1 - 1
install/sql/system.sql

@@ -851,7 +851,7 @@ CREATE TABLE `sys_acl_levels` (
   `Active` enum('yes','no') NOT NULL default 'no',
   `Purchasable` enum('yes','no') NOT NULL default 'yes',
   `Removable` enum('yes','no') NOT NULL default 'yes',
-  `QuotaSize` int(11) NOT NULL,
+  `QuotaSize` bigint(20) NOT NULL,
   `QuotaNumber` int(11) NOT NULL,
   `QuotaMaxFileSize` int(11) NOT NULL,
   `Order` int(11) NOT NULL default '0',

+ 3 - 2
modules/boonex/english/data/langs/system/en.xml

@@ -848,11 +848,12 @@
 	<string name="_adm_form_txt_field_visible_for_selected"><![CDATA[Selected levels]]></string>
 	<string name="_adm_form_txt_field_db_pass"><![CDATA[Process data as]]></string>
 	<string name="_adm_form_txt_field_db_pass_date"><![CDATA[Date]]></string>
-    <string name="_adm_form_txt_field_db_pass_date_ts"><![CDATA[Date as Unix Timestamp]]></string>
-    <string name="_adm_form_txt_field_db_pass_date_utc"><![CDATA[UTC Date as Unix Timestamp]]></string>
+        <string name="_adm_form_txt_field_db_pass_date_ts"><![CDATA[Date as Unix Timestamp]]></string>
+        <string name="_adm_form_txt_field_db_pass_date_utc"><![CDATA[UTC Date as Unix Timestamp]]></string>
 	<string name="_adm_form_txt_field_db_pass_date_time"><![CDATA[Date/time]]></string>
 	<string name="_adm_form_txt_field_db_pass_date_time_ts"><![CDATA[Date/time as Unix Timestamp]]></string>
 	<string name="_adm_form_txt_field_db_pass_date_time_utc"><![CDATA[UTC Date/time as Unix Timestamp]]></string>
+        <string name="_adm_form_txt_field_db_pass_select_value"><![CDATA[Select value...]]></string>
 	<string name="_adm_form_txt_fields_caption_system"><![CDATA[System Name]]></string>
 	<string name="_adm_form_txt_fields_manage_visibility"><![CDATA[Manage visibility settings]]></string>
 	<string name="_adm_form_txt_fields_module"><![CDATA[Module]]></string>

+ 0 - 4
modules/boonex/lucid/data/template/bx_channels/css/main.css

@@ -59,7 +59,3 @@
 	-webkit-flex-grow: 3;
 	flex-grow: 3;
 }
-
-.bx-base-pofile-unit-with-cover.bx-channels-unit-with-cover .bx-base-general-unit-meta ul.bx-menu-custom li .bx-base-profile-unit-meta-item {
-	line-height: normal;
-}

+ 0 - 4
modules/boonex/lucid/data/template/bx_events/css/main.css

@@ -59,7 +59,3 @@
 	-webkit-flex-grow: 3;
 	flex-grow: 3;
 }
-
-.bx-base-pofile-unit-with-cover.bx-events-unit-with-cover .bx-base-general-unit-meta ul.bx-menu-custom li .bx-base-profile-unit-meta-item {
-	line-height: normal;
-}

+ 0 - 4
modules/boonex/lucid/data/template/bx_groups/css/main.css

@@ -59,7 +59,3 @@
 	-webkit-flex-grow: 3;
 	flex-grow: 3;
 }
-
-.bx-base-pofile-unit-with-cover.bx-groups-unit-with-cover .bx-base-general-unit-meta ul.bx-menu-custom li .bx-base-profile-unit-meta-item {
-	line-height: normal;
-}

+ 0 - 4
modules/boonex/lucid/data/template/bx_persons/css/main.css

@@ -52,7 +52,3 @@
 	-webkit-flex-grow: 3;
 	flex-grow: 3;
 }
-
-.bx-base-pofile-unit-with-cover .bx-base-general-unit-meta ul.bx-menu-custom li .bx-base-profile-unit-meta-item {
-	line-height: normal;
-}

+ 0 - 4
modules/boonex/lucid/data/template/bx_spaces/css/main.css

@@ -59,7 +59,3 @@
 	-webkit-flex-grow: 3;
 	flex-grow: 3;
 }
-
-.bx-base-pofile-unit-with-cover.bx-spaces-unit-with-cover .bx-base-general-unit-meta ul.bx-menu-custom li .bx-base-profile-unit-meta-item {
-	line-height: normal;
-}

+ 0 - 1
modules/boonex/mobile_apps/template/mobile_apps_js.html

@@ -54,7 +54,6 @@
             $(document).ready(function () {
                 document.querySelector('body').addEventListener('click', event => {
                     let link = event.target.href;
-                    console.log(link);
                     if (event.target.tagName.toLowerCase() !== 'a') 
                         return;
                     event.preventDefault();

+ 3 - 0
modules/boonex/mobile_apps/template/mobile_apps_styles.html

@@ -22,6 +22,9 @@ html .bx-menu-toolbar-padding {
 html #bx-toolbar-content {
     display:none;
 }
+html #bx-menu-main-bar-wrapper {
+    display:none;
+}
 html .cd-side-nav,
 html .cd-main-content .content-wrapper {
     padding-top:0;

+ 7 - 6
modules/boonex/russian/data/langs/system/ru.xml

@@ -845,12 +845,13 @@
 	<string name="_adm_form_txt_field_visible_for_levels"><![CDATA[Выбрать уровни]]></string>
 	<string name="_adm_form_txt_field_visible_for_selected"><![CDATA[Выбранные уровни]]></string>
 	<string name="_adm_form_txt_field_db_pass"><![CDATA[Обработать как]]></string>
-    <string name="_adm_form_txt_field_db_pass_date"><![CDATA[Дата]]></string>
-    <string name="_adm_form_txt_field_db_pass_date_ts"><![CDATA[Дата (метка времени Unix)]]></string>
-    <string name="_adm_form_txt_field_db_pass_date_utc"><![CDATA[UTC дата (метка времени Unix)]]></string>
-    <string name="_adm_form_txt_field_db_pass_date_time"><![CDATA[Дата и время]]></string>
-    <string name="_adm_form_txt_field_db_pass_date_time_ts"><![CDATA[Дата и время (метка времени Unix)]]></string>
-    <string name="_adm_form_txt_field_db_pass_date_time_utc"><![CDATA[UTC дата и время (метка времени Unix)]]></string>
+        <string name="_adm_form_txt_field_db_pass_date"><![CDATA[Дата]]></string>
+        <string name="_adm_form_txt_field_db_pass_date_ts"><![CDATA[Дата (метка времени Unix)]]></string>
+        <string name="_adm_form_txt_field_db_pass_date_utc"><![CDATA[UTC дата (метка времени Unix)]]></string>
+        <string name="_adm_form_txt_field_db_pass_date_time"><![CDATA[Дата и время]]></string>
+        <string name="_adm_form_txt_field_db_pass_date_time_ts"><![CDATA[Дата и время (метка времени Unix)]]></string>
+        <string name="_adm_form_txt_field_db_pass_date_time_utc"><![CDATA[UTC дата и время (метка времени Unix)]]></string>
+        <string name="_adm_form_txt_field_db_pass_select_value"><![CDATA[Выбрать значение...]]></string>
 	<string name="_adm_form_txt_fields_caption_system"><![CDATA[Системное имя]]></string>
 	<string name="_adm_form_txt_fields_manage_visibility"><![CDATA[Управление настройками видимости]]></string>
 	<string name="_adm_form_txt_fields_module"><![CDATA[Модуль]]></string>

+ 2 - 0
studio/template/scripts/BxBaseStudioFormsField.php

@@ -1221,6 +1221,7 @@ class BxBaseStudioFormsFieldDatepicker extends BxBaseStudioFormsFieldText
                 'info' => _t('_adm_form_dsc_field_db_pass'),
                 'value' => $this->sDbPass,
                 'values' => array(
+                    array('key' => '', 'value' => _t('_adm_form_txt_field_db_pass_select_value')),
                     array('key' => 'Date', 'value' => _t('_adm_form_txt_field_db_pass_date')),
                     array('key' => 'DateTs', 'value' => _t('_adm_form_txt_field_db_pass_date_ts')),
                     array('key' => 'DateUtc', 'value' => _t('_adm_form_txt_field_db_pass_date_utc')),
@@ -1255,6 +1256,7 @@ class BxBaseStudioFormsFieldDatetime extends BxBaseStudioFormsFieldDatepicker
         $this->aForm['inputs']['value']['db']['pass'] = $this->sDbPass;
 
         $this->aForm['inputs']['db_pass']['values'] = array(
+            array('key' => '', 'value' => _t('_adm_form_txt_field_db_pass_select_value')),
             array('key' => 'DateTime', 'value' => _t('_adm_form_txt_field_db_pass_date_time')),
             array('key' => 'DateTimeTs', 'value' => _t('_adm_form_txt_field_db_pass_date_time_ts')),
             array('key' => 'DateTimeUtc', 'value' => _t('_adm_form_txt_field_db_pass_date_time_utc')),