mirror of
				https://github.com/Mibew/java.git
				synced 2025-11-04 12:25:12 +03:00 
			
		
		
		
	optional popup notification of the new visitor
git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@468 c66351dc-e62f-0410-b875-e3a5c0b9693f
This commit is contained in:
		
							parent
							
								
									147beb3ed2
								
							
						
					
					
						commit
						3866f37f22
					
				@ -1,5 +1,5 @@
 | 
				
			|||||||
#!/bin/sh
 | 
					#!/bin/sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cd webim/js/source
 | 
					cd webim/js/source
 | 
				
			||||||
~/distrib/apache-ant-1.7.0/bin/ant
 | 
					/usr/local/ant/bin/ant
 | 
				
			||||||
rm -rf bin
 | 
					rm -rf bin
 | 
				
			||||||
 | 
				
			|||||||
@ -12,7 +12,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
//- onComplete, obj, params, $apply$
 | 
					//- onComplete, obj, params, $apply$
 | 
				
			||||||
//- threadParams, servl, frequency, user, threadid, token, cssfile
 | 
					//- threadParams, servl, frequency, user, threadid, token, cssfile
 | 
				
			||||||
//- updaterOptions, url, company, agentservl, noclients, wroot, havemenu
 | 
					//- updaterOptions, url, company, agentservl, noclients, wroot, havemenu, showpopup
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var Class = {
 | 
					var Class = {
 | 
				
			||||||
 | 
				
			|||||||
@ -296,6 +296,9 @@ Class.inherit( Ajax.ThreadListUpdater, Ajax.Base, {
 | 
				
			|||||||
		if( newAdded ) {
 | 
							if( newAdded ) {
 | 
				
			||||||
			playSound(webimRoot+'/sounds/new_user.wav');
 | 
								playSound(webimRoot+'/sounds/new_user.wav');
 | 
				
			||||||
			window.focus();
 | 
								window.focus();
 | 
				
			||||||
 | 
								if(updaterOptions.showpopup) {
 | 
				
			||||||
 | 
									alert(localized[5]);
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	} else if( root.tagName == 'error' ) {
 | 
						} else if( root.tagName == 'error' ) {
 | 
				
			||||||
		this.setStatus(NodeUtils.getNodeValue(root,"descr") );
 | 
							this.setStatus(NodeUtils.getNodeValue(root,"descr") );
 | 
				
			||||||
 | 
				
			|||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@ -542,6 +542,7 @@ $settings = array(
 | 
				
			|||||||
		'surveyaskmail' => '0',
 | 
							'surveyaskmail' => '0',
 | 
				
			||||||
		'surveyaskgroup' => '1',
 | 
							'surveyaskgroup' => '1',
 | 
				
			||||||
		'surveyaskmessage' => '0',
 | 
							'surveyaskmessage' => '0',
 | 
				
			||||||
 | 
						'enablepopupnotification' => '0',
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
$settingsloaded = false;
 | 
					$settingsloaded = false;
 | 
				
			||||||
$settings_in_db = array();
 | 
					$settings_in_db = array();
 | 
				
			||||||
 | 
				
			|||||||
@ -319,6 +319,7 @@ page_settings.tab.main=General
 | 
				
			|||||||
page_settings.tab.themes=Themes preview
 | 
					page_settings.tab.themes=Themes preview
 | 
				
			||||||
pending.menu.hide=Hide menu >>
 | 
					pending.menu.hide=Hide menu >>
 | 
				
			||||||
pending.menu.show=Show menu >>
 | 
					pending.menu.show=Show menu >>
 | 
				
			||||||
 | 
					pending.popup_notification=New visitor is waiting for an answer. 
 | 
				
			||||||
pending.table.ban=Ban the visitor
 | 
					pending.table.ban=Ban the visitor
 | 
				
			||||||
pending.table.head.contactid=Visitor's address
 | 
					pending.table.head.contactid=Visitor's address
 | 
				
			||||||
pending.table.head.etc=Misc
 | 
					pending.table.head.etc=Misc
 | 
				
			||||||
@ -384,6 +385,8 @@ settings.host.description=Destination for you company name or logo link
 | 
				
			|||||||
settings.host=URL of your website
 | 
					settings.host=URL of your website
 | 
				
			||||||
settings.logo.description=Enter http address of your company logo
 | 
					settings.logo.description=Enter http address of your company logo
 | 
				
			||||||
settings.logo=Your company logo
 | 
					settings.logo=Your company logo
 | 
				
			||||||
 | 
					settings.popup_notification.description=Small dialog appears to attract your attention.  
 | 
				
			||||||
 | 
					settings.popup_notification=Enable "Popup dialog notification of the new visitor"
 | 
				
			||||||
settings.no.title=Please enter your company title
 | 
					settings.no.title=Please enter your company title
 | 
				
			||||||
settings.onehostconnections.description=0 allows any number of connections
 | 
					settings.onehostconnections.description=0 allows any number of connections
 | 
				
			||||||
settings.onehostconnections=Max number of threads from one address
 | 
					settings.onehostconnections=Max number of threads from one address
 | 
				
			||||||
 | 
				
			|||||||
@ -319,6 +319,7 @@ page_settings.tab.main=
 | 
				
			|||||||
page_settings.tab.themes=Просмотр стилей
 | 
					page_settings.tab.themes=Просмотр стилей
 | 
				
			||||||
pending.menu.hide=Спрятать меню >>
 | 
					pending.menu.hide=Спрятать меню >>
 | 
				
			||||||
pending.menu.show=Показать меню >>
 | 
					pending.menu.show=Показать меню >>
 | 
				
			||||||
 | 
					pending.popup_notification=Новый посетитель ожидает ответа. 
 | 
				
			||||||
pending.table.ban=Пометить посетителя как нежелательного
 | 
					pending.table.ban=Пометить посетителя как нежелательного
 | 
				
			||||||
pending.table.head.contactid=Адрес посетителя
 | 
					pending.table.head.contactid=Адрес посетителя
 | 
				
			||||||
pending.table.head.etc=Разное
 | 
					pending.table.head.etc=Разное
 | 
				
			||||||
@ -384,6 +385,8 @@ settings.host.description=
 | 
				
			|||||||
settings.host=Ссылка на ваш веб сайт
 | 
					settings.host=Ссылка на ваш веб сайт
 | 
				
			||||||
settings.logo.description=Введите ссылку на логотип компании
 | 
					settings.logo.description=Введите ссылку на логотип компании
 | 
				
			||||||
settings.logo=Лого компании
 | 
					settings.logo=Лого компании
 | 
				
			||||||
 | 
					settings.popup_notification.description=Позволяет привлечь ваше внимание, если звукового и визуального оповещения недостаточно.
 | 
				
			||||||
 | 
					settings.popup_notification=Показывать небольшой диалог при появлении новых посетителей в очереди.
 | 
				
			||||||
settings.no.title=Введите имя Вашей компании
 | 
					settings.no.title=Введите имя Вашей компании
 | 
				
			||||||
settings.onehostconnections.description=0 разрешает любое количество соединений
 | 
					settings.onehostconnections.description=0 разрешает любое количество соединений
 | 
				
			||||||
settings.onehostconnections=Максимальное количество диалогов с одного адреса
 | 
					settings.onehostconnections=Максимальное количество диалогов с одного адреса
 | 
				
			||||||
 | 
				
			|||||||
@ -21,7 +21,11 @@ $operator = check_login();
 | 
				
			|||||||
$page = array('agentId' => '');
 | 
					$page = array('agentId' => '');
 | 
				
			||||||
$errors = array();
 | 
					$errors = array();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$options = array('enableban', 'usercanchangename', 'enablessl', 'enablegroups', 'enablestatistics', 'enablepresurvey', 'surveyaskmail', 'surveyaskgroup', 'surveyaskmessage', 'forcessl');
 | 
					$options = array(
 | 
				
			||||||
 | 
							'enableban', 'usercanchangename', 'enablegroups', 'enablestatistics',
 | 
				
			||||||
 | 
							'enablessl', 'forcessl',  
 | 
				
			||||||
 | 
							'enablepresurvey', 'surveyaskmail', 'surveyaskgroup', 'surveyaskmessage',
 | 
				
			||||||
 | 
							'enablepopupnotification');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
loadsettings();
 | 
					loadsettings();
 | 
				
			||||||
$params = array();
 | 
					$params = array();
 | 
				
			||||||
 | 
				
			|||||||
@ -35,6 +35,7 @@ if($settings['enablegroups'] == '1') {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
$page = array();
 | 
					$page = array();
 | 
				
			||||||
$page['havemenu'] = isset($_GET['nomenu']) ? "0" : "1";
 | 
					$page['havemenu'] = isset($_GET['nomenu']) ? "0" : "1";
 | 
				
			||||||
 | 
					$page['showpopup'] = $settings['enablepopupnotification'] == '1' ? "1" : "0";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
prepare_menu($operator);
 | 
					prepare_menu($operator);
 | 
				
			||||||
start_html_output();
 | 
					start_html_output();
 | 
				
			||||||
 | 
				
			|||||||
@ -168,6 +168,15 @@ require_once('inc_errors.php');
 | 
				
			|||||||
			</div>
 | 
								</div>
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							<div class="field">
 | 
				
			||||||
 | 
								<div class="flabel"><?php echo getlocal('settings.popup_notification') ?></div>
 | 
				
			||||||
 | 
								<div class="fvalue">
 | 
				
			||||||
 | 
									<input type="checkbox" name="enablepopupnotification" value="on"<?php echo form_value_cb('enablepopupnotification') ? " checked=\"checked\"" : "" ?>/>
 | 
				
			||||||
 | 
								</div>
 | 
				
			||||||
 | 
								<div class="fdescr"> — <?php echo getlocal('settings.popup_notification.description') ?></div>
 | 
				
			||||||
 | 
								<br clear="left"/>
 | 
				
			||||||
 | 
							</div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		<div class="fbutton">
 | 
							<div class="fbutton">
 | 
				
			||||||
			<input type="image" name="save" value="" src='<?php echo $webimroot.getlocal("image.button.save") ?>' alt='<?php echo getlocal("button.save") ?>'/>
 | 
								<input type="image" name="save" value="" src='<?php echo $webimroot.getlocal("image.button.save") ?>' alt='<?php echo getlocal("button.save") ?>'/>
 | 
				
			||||||
		</div>
 | 
							</div>
 | 
				
			||||||
 | 
				
			|||||||
@ -26,12 +26,13 @@ var localized = new Array(
 | 
				
			|||||||
    "<?php echo getlocal("pending.table.view") ?>",
 | 
					    "<?php echo getlocal("pending.table.view") ?>",
 | 
				
			||||||
    "<?php echo getlocal("pending.table.ban") ?>",
 | 
					    "<?php echo getlocal("pending.table.ban") ?>",
 | 
				
			||||||
    "<?php echo htmlspecialchars(getlocal("pending.menu.show")) ?>",
 | 
					    "<?php echo htmlspecialchars(getlocal("pending.menu.show")) ?>",
 | 
				
			||||||
    "<?php echo htmlspecialchars(getlocal("pending.menu.hide")) ?>"
 | 
					    "<?php echo htmlspecialchars(getlocal("pending.menu.hide")) ?>",
 | 
				
			||||||
 | 
					    "<?php echo htmlspecialchars(getlocal("pending.popup_notification")) ?>"
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
var updaterOptions = {
 | 
					var updaterOptions = {
 | 
				
			||||||
	url:"<?php echo $webimroot ?>/operator/update.php",wroot:"<?php echo $webimroot ?>",
 | 
						url:"<?php echo $webimroot ?>/operator/update.php",wroot:"<?php echo $webimroot ?>",
 | 
				
			||||||
	agentservl:"<?php echo $webimroot ?>/operator/agent.php",
 | 
						agentservl:"<?php echo $webimroot ?>/operator/agent.php",
 | 
				
			||||||
	noclients:"<?php echo getlocal("clients.no_clients") ?>", havemenu: <?php echo $page['havemenu'] ?>, };
 | 
						noclients:"<?php echo getlocal("clients.no_clients") ?>", havemenu: <?php echo $page['havemenu'] ?>, showpopup: <?php echo $page['showpopup'] ?> };
 | 
				
			||||||
//--></script>
 | 
					//--></script>
 | 
				
			||||||
<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/users.js?v=160a1"></script>
 | 
					<script type="text/javascript" language="javascript" src="<?php echo $webimroot ?>/js/users.js?v=160a1"></script>
 | 
				
			||||||
<?php
 | 
					<?php
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user