Ticket #923

inc/classes/BxDolTemplate.php

@@ -407,7 +407,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         //--- Load translations in JS ---//
         bx_import('BxDolLanguages');
         $this->addJsTranslation(array(
-            '_are you sure?',
+            '_Are_you_sure',
             '_error occured',
             '_sys_loading',
         ));

inc/js/classes/BxDolCmts.js

@@ -655,7 +655,7 @@ BxDolCmts.prototype._loadingInButton = function(e, bShow) {
 };
 
 BxDolCmts.prototype._confirm = function() {
-    return confirm(_t('_are you sure?'));
+    return confirm(_t('_Are_you_sure'));
 };
 
 /** @} */

inc/js/functions.js

@@ -42,7 +42,7 @@ function processJsonData(oData) {
 
 function getHtmlData( elem, url, callback, method , confirmation)
 {
-    if ('undefined' != typeof(confirmation) && confirmation && !confirm(_t('_are you sure?'))) 
+    if ('undefined' != typeof(confirmation) && confirmation && !confirm(_t('_Are_you_sure'))) 
         return false;
 
     // in most cases it is element ID, in other cases - object of jQuery
@@ -630,7 +630,7 @@ function bx_time(sLang, isAutoupdate, sRootSel) {
  * @param bConfirm - show confirmation dialog
  */
 function bx_conn_action(e, sObj, sAction, iContentId, bConfirm, fOnComplete) {
-    if ('undefined' != typeof(bConfirm) && bConfirm && !confirm(_t('_are you sure?')))
+    if ('undefined' != typeof(bConfirm) && bConfirm && !confirm(_t('_Are_you_sure')))
         return;
                 
     var aParams = {

inc/js/jquery.dolPopup.js

@@ -510,6 +510,105 @@
         });
     };
 
+    $.fn.dolPopupAlert = function(options) {
+    	var oAPopup = $('#bx-popup-alert');
+
+    	if(options.message)
+    		oAPopup.find('.popup_alert_text').html(options.message);
+
+    	oAPopup.find('.popup_alert_ok').bind('click', function() {
+			if(options.onClickOk && typeof(options.onClickOk) == 'function')
+				options.onClickOk(oAPopup);
+
+			oAPopup.dolPopupHide();
+		});
+
+		var fOnHide = options.onHide;
+		options.onHide = function(oPopup) {
+			if(typeof(fOnHide) == 'function')
+				fOnHide(oAPopup);
+
+			oAPopup.find('.bx-btn').unbind('click');
+		};
+
+		oAPopup.dolPopup(options);
+    };
+
+    $.fn.dolPopupConfirm = function(options) {
+    	var oCPopup = $('#bx-popup-confirm');
+
+    	if(options.message)
+    		oCPopup.find('.popup_confirm_text').html(options.message);
+
+    	oCPopup.find('.popup_confirm_yes').bind('click', function(event) {
+            event.stopPropagation();
+
+			if(options.onClickYes && typeof(options.onClickYes) == 'function')
+				options.onClickYes(oCPopup);
+
+			oCPopup.dolPopupHide();
+		});
+
+		oCPopup.find('.popup_confirm_no').bind('click', function(event) {
+            event.stopPropagation();
+
+			if (options.onClickNo && typeof(options.onClickNo) == 'function')
+				options.onClickNo(oCPopup);
+
+			oCPopup.dolPopupHide();
+		});
+
+		var fOnHide = options.onHide;
+		options.onHide = function(oPopup) {
+			if(typeof(fOnHide) == 'function')
+				fOnHide(oCPopup);
+
+			oCPopup.find('.bx-btn').unbind('click');
+		};
+
+		oCPopup.dolPopup(options);
+    };
+
+    $.fn.dolPopupPrompt = function(options) {
+    	var oPPopup = $('#bx-popup-prompt');
+
+    	oPPopup.setValue = function(mixedValue) {
+    		return oPPopup.find('[name="bx-popup-prompt-value"]').val(mixedValue);
+    	};
+
+    	oPPopup.getValue = function() {
+    		return oPPopup.find('[name="bx-popup-prompt-value"]').val();
+    	};   		
+
+    	if(options.message)
+    		oPPopup.find('.popup_prompt_text').html(options.message);
+
+    	oPPopup.find('.popup_prompt_ok').bind('click', function() {
+			if(options.onClickOk && typeof(options.onClickOk) == 'function')
+				options.onClickOk(oPPopup);
+
+			oPPopup.dolPopupHide();
+		});
+
+		oPPopup.find('.popup_prompt_cancel').bind('click', function() {
+			if(options.onClickCancel && typeof(options.onClickCancel) == 'function')
+				options.onClickCancel(oPPopup);
+
+			oPPopup.dolPopupHide();
+		});
+
+		var fOnHide = options.onHide;
+		options.onHide = function(oPopup) {
+			if(typeof(fOnHide) == 'function')
+				fOnHide(oPPopup);
+
+			oPPopup.setValue('');
+			oPPopup.find('.bx-btn').unbind('click');
+		};
+
+		oPPopup.dolPopup(options);
+    };
+
     $.fn._dolPopupSetPosition = function(options) {
 
         var o = $.extend({}, $.fn.dolPopupDefaultOptions, options);

install/sql/system.sql

@@ -1183,6 +1183,9 @@ CREATE TABLE `sys_injections` (
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 INSERT INTO `sys_injections`(`name`, `page_index`, `key`, `type`, `data`, `replace`, `active`) VALUES
+('sys_popup_alert', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"add_popup_alert";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
+('sys_popup_confirm', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:17:"add_popup_confirm";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
+('sys_popup_prompt', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"add_popup_prompt";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
 ('update_cache', 150, 'injection_head', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:17:"get_cache_updater";s:6:"params";a:0:{}s:5:"class";s:19:"TemplStudioLauncher";}', 0, 1),
 ('live_updates', 0, 'injection_head', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:4:"init";s:6:"params";a:0:{}s:5:"class";s:24:"TemplLiveUpdatesServices";}', 0, 1),
 ('sys_head', 0, 'injection_head', 'text', '', 0, 1),
@@ -1190,6 +1193,7 @@ INSERT INTO `sys_injections`(`name`, `page_index`, `key`, `type`, `data`, `repla
 
 -- --------------------------------------------------------
 
+
 CREATE TABLE `sys_injections_admin` (
   `id` int(11) unsigned NOT NULL auto_increment,
   `name` varchar(128) NOT NULL default '',
@@ -1202,6 +1206,11 @@ CREATE TABLE `sys_injections_admin` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+INSERT INTO `sys_injections_admin`(`name`, `page_index`, `key`, `type`, `data`, `replace`, `active`) VALUES
+('sys_popup_alert', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"add_popup_alert";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
+('sys_popup_confirm', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:17:"add_popup_confirm";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
+('sys_popup_prompt', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"add_popup_prompt";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1);
+
 -- --------------------------------------------------------
 
 

modules/boonex/convos/js/main.js

@@ -8,7 +8,7 @@ function bx_cnv_mark_unread(e, iConvoId) {
 }
 
 function bx_cnv_action(sAction, e, iConvoId, isConfirm) {
-    if (isConfirm && !confirm(_t('_are you sure?')))
+    if (isConfirm && !confirm(_t('_Are_you_sure')))
         return false;
 
     bx_loading_btn(e, 1);

modules/boonex/english/data/langs/system/en.xml

@@ -11,6 +11,7 @@
 	<string name="_Allowed Since"><![CDATA[Allowed Since]]></string>
 	<string name="_Allowed Until"><![CDATA[Allowed Until]]></string>
 	<string name="_Allowed actions"><![CDATA[Allowed actions]]></string>
+	<string name="_Are_you_sure"><![CDATA[Are you sure?]]></string>
 	<string name="_Auth type"><![CDATA[Auth type]]></string>
 	<string name="_Basic"><![CDATA[Basic]]></string>
 	<string name="_CONTACT_H"><![CDATA[Contact us]]></string>
@@ -30,6 +31,7 @@
 	<string name="_Email"><![CDATA[Email]]></string>
 	<string name="_Email sent failed"><![CDATA[Email send failed]]></string>
 	<string name="_Empty"><![CDATA[Empty]]></string>
+	<string name="_Enter_value_here"><![CDATA[Please, enter a value here]]></string>
 	<string name="_Error"><![CDATA[Error]]></string>
 	<string name="_Failed"><![CDATA[Failed]]></string>
 	<string name="_favorite_counter"><![CDATA[{0}]]></string>
@@ -71,6 +73,7 @@
 	<string name="_None"><![CDATA[None]]></string>
 	<string name="_No actions allowed for this membership"><![CDATA[No actions allowed for this membership]]></string>
 	<string name="_No such comment"><![CDATA[No such comment]]></string>
+	<string name="_Ok"><![CDATA[OK]]></string>
 	<string name="_Period"><![CDATA[Period]]></string>
 	<string name="_Please Wait"><![CDATA[Please Wait]]></string>
 	<string name="_Please enter n1-n2 characters"><![CDATA[Please enter {0}-{1} characters]]></string>
@@ -1477,7 +1480,6 @@
 	<string name="_adm_wgt_cpt_settings"><![CDATA[Settings]]></string>
 	<string name="_adm_wgt_cpt_storages"><![CDATA[Storage]]></string>
 	<string name="_adm_wgt_cpt_store"><![CDATA[Apps Market]]></string>
-	<string name="_are you sure?"><![CDATA[Are you sure?]]></string>
 	<string name="_cmt_block_comments_title"><![CDATA[Comments ({0})]]></string>
 	<string name="_cmt_browse_all"><![CDATA[All]]></string>
 	<string name="_cmt_browse_friends"><![CDATA[Friends]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -11,6 +11,7 @@
 	<string name="_Allowed Since"><![CDATA[Разрешено с]]></string>
 	<string name="_Allowed Until"><![CDATA[Разрешено до]]></string>
 	<string name="_Allowed actions"><![CDATA[Разрешённые действия]]></string>
+	<string name="_Are_you_sure"><![CDATA[Вы уверены?]]></string>
 	<string name="_Auth type"><![CDATA[Тип авторизации]]></string>
 	<string name="_Basic"><![CDATA[Базовая]]></string>
 	<string name="_CONTACT_H"><![CDATA[Написать нам]]></string>
@@ -30,6 +31,7 @@
 	<string name="_Email"><![CDATA[Имейл]]></string>
 	<string name="_Email sent failed"><![CDATA[Невозможно послать письмо]]></string>
 	<string name="_Empty"><![CDATA[Пусто]]></string>
+	<string name="_Enter_value_here"><![CDATA[Пожалуйста, введите значение]]></string>
 	<string name="_Error"><![CDATA[Ошибка]]></string>
 	<string name="_Failed"><![CDATA[Неудача]]></string>
 	<string name="_favorite_counter"><![CDATA[{0}]]></string>
@@ -71,6 +73,7 @@
 	<string name="_None"><![CDATA[Никакой]]></string>
 	<string name="_No actions allowed for this membership"><![CDATA[Нет разрешённых действий для данного членства]]></string>
 	<string name="_No such comment"><![CDATA[Нет такого комментария]]></string>
+	<string name="_Ok"><![CDATA[ОК]]></string>
 	<string name="_Period"><![CDATA[Период]]></string>
 	<string name="_Please Wait"><![CDATA[Пожалуйста, подождите]]></string>
 	<string name="_Please enter n1-n2 characters"><![CDATA[Пожалуйста, введите {0}-{1} символов]]></string>
@@ -1475,7 +1478,6 @@
 	<string name="_adm_wgt_cpt_settings"><![CDATA[Настройки]]></string>
 	<string name="_adm_wgt_cpt_storages"><![CDATA[Хранилище]]></string>
 	<string name="_adm_wgt_cpt_store"><![CDATA[Магазин приложений]]></string>
-	<string name="_are you sure?"><![CDATA[Вы уверены?]]></string>
 	<string name="_cmt_block_comments_title"><![CDATA[Комментарии ({0})]]></string>
 	<string name="_cmt_browse_all"><![CDATA[Все]]></string>
 	<string name="_cmt_browse_friends"><![CDATA[Друзья]]></string>

template/css/common.css

@@ -278,6 +278,20 @@ body > .bx-popup-wrapper {
     display:none;
 }
 
+#bx-popup-alert,
+#bx-popup-confirm,
+#bx-popup-prompt {
+	max-width: 500px;
+	max-width: 31.25rem;
+}
+
+.popup_alert_actions .bx-btn,
+.popup_confirm_actions .bx-btn,
+.popup_prompt_actions .bx-btn {
+    float: none;
+    display: inline-block;
+}
+
 /* --------------- notification boxes */
 .bx-popup-inline-holder {
 	padding-top: 70px;

template/css/default.less

@@ -19,6 +19,11 @@
 .bx-def-margin-neg { 
     .margin(-@bx-margin);
 }
+.bx-def-margin-lefttopright {
+    .margin-left(@bx-margin);
+    .margin-top(@bx-margin);
+    .margin-right(@bx-margin);
+}
 .bx-def-margin-rightbottomleft {
     .margin-right(@bx-margin);
     .margin-bottom(@bx-margin);
@@ -187,6 +192,11 @@
 .bx-def-padding {
     .padding(@bx-padding);
 }
+.bx-def-padding-lefttopright {
+    .padding-left(@bx-padding);
+    .padding-top(@bx-padding);
+    .padding-right(@bx-padding);
+}
 .bx-def-padding-rightbottomleft {
     .padding-right(@bx-padding);
     .padding-bottom(@bx-padding);

template/popup_trans_alert_cnt.html

@@ -0,0 +1,4 @@
+<div class="popup_alert_text bx-def-padding bx-def-font-align-center"></div>
+<div class="popup_alert_actions bx-def-padding-rightbottomleft bx-def-font-align-center bx-clearfix">
+    <button class="bx-btn popup_alert_ok" type="button"><bx_text:_Ok /></button>
+</div>

template/popup_trans_confirm_cnt.html

@@ -0,0 +1,4 @@
+<div class="popup_confirm_text bx-def-padding bx-def-font-align-center"><bx_text:_Are_you_sure /></div>
+<div class="popup_confirm_actions bx-def-padding-rightbottomleft bx-def-font-align-center bx-clearfix">
+    <button class="bx-btn bx-def-margin-sec-left-auto popup_confirm_yes" type="button"><bx_text:_Yes /></button><button class="bx-btn bx-def-margin-sec-left-auto popup_confirm_no" type="button"><bx_text:_No /></button>
+</div>

template/popup_trans_prompt_cnt.html

@@ -0,0 +1,5 @@
+<div class="popup_prompt_text bx-def-padding-lefttopright bx-def-font-align-center"><bx_text:_Enter_value_here /></div>
+<div class="popup_prompt_input bx-def-padding">__input__</div>
+<div class="popup_prompt_actions bx-def-padding-rightbottomleft bx-def-font-align-center bx-clearfix">
+	<button class="bx-btn bx-def-margin-sec-left-auto popup_prompt_ok" type="button"><bx_text:_Ok /></button><button class="bx-btn bx-def-margin-sec-left-auto popup_prompt_cancel" type="button"><bx_text:_Cancel /></button>
+</div>

template/scripts/BxBaseServices.php

@@ -135,6 +135,37 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
         BxDolTemplate::getInstance()->addCss(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'cubiq-add-to-homescreen/style/|addtohomescreen.css');
         return "<script>addToHomescreen();</script>";
     }
+
+    public function serviceAddPopupAlert()
+    {
+        return BxTemplFunctions::getInstance()->transBox('bx-popup-alert', BxDolTemplate::getInstance()->parseHtmlByName('popup_trans_alert_cnt.html', array()), true);
+    }
+
+    public function serviceAddPopupConfirm()
+    {
+        return BxTemplFunctions::getInstance()->transBox('bx-popup-confirm', BxDolTemplate::getInstance()->parseHtmlByName('popup_trans_confirm_cnt.html', array()), true);
+    }
+
+    public function serviceAddPopupPrompt()
+    {
+        $oTemplate = BxDolTemplate::getInstance();
+
+        $sInputText = '$bx-popup-prompt-value';
+        $aInputText = array(
+            'type' => 'text',
+            'name' => $sInputText,
+            'attrs' => array(
+                'id' => $sInputText,
+            ),
+            'value' => '',
+            'caption' => ''
+        );
+
+        $oForm = new BxTemplFormView(array(), $oTemplate);
+        return BxTemplFunctions::getInstance()->transBox('bx-popup-prompt', $oTemplate->parseHtmlByName('popup_trans_prompt_cnt.html', array(
+            'input' => $oForm->genRow($aInputText)
+        )), true);
+    }
 }
 
 /** @} */