diff -Nru drupal7-mod-drucall-2.0.1/available_languages.xml drupal7-mod-drucall-2.1/available_languages.xml --- drupal7-mod-drucall-2.0.1/available_languages.xml 1970-01-01 01:00:00.000000000 +0100 +++ drupal7-mod-drucall-2.1/available_languages.xml 2014-11-06 19:08:37.000000000 +0100 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list> +<language> + <display>Български</display> + <code>bg</code> +</language> +<language> + <display>Deutsch</display> + <code>de</code> +</language> +<language> + <display>English</display> + <code>en</code> +</language> +<language> + <display>Español</display> + <code>es</code> +</language> +<language> + <display>Français</display> + <code>fr</code> +</language> +<language> + <display>עברית</display> + <code>he</code> +</language> +<language> + <display>Polski</display> + <code>pl</code> +</language> +<language> + <display>Português</display> + <code>pt</code> +</language> +<language> + <display>slovenčina</display> + <code>sk</code> +</language> +</list> diff -Nru drupal7-mod-drucall-2.0.1/debian/changelog drupal7-mod-drucall-2.1/debian/changelog --- drupal7-mod-drucall-2.0.1/debian/changelog 2014-02-04 21:30:57.000000000 +0100 +++ drupal7-mod-drucall-2.1/debian/changelog 2014-11-06 20:05:11.000000000 +0100 @@ -1,3 +1,10 @@ +drupal7-mod-drucall (2.1-1) unstable; urgency=medium + + * New upstream release. + * Sync content with JSCommunicator. (Closes: #768354) + + -- Daniel Pocock <[email protected]> Thu, 06 Nov 2014 19:33:06 +0100 + drupal7-mod-drucall (2.0.1-1) unstable; urgency=low * New upstream release diff -Nru drupal7-mod-drucall-2.0.1/debian/control drupal7-mod-drucall-2.1/debian/control --- drupal7-mod-drucall-2.0.1/debian/control 2014-01-24 13:04:00.000000000 +0100 +++ drupal7-mod-drucall-2.1/debian/control 2014-11-06 20:06:51.000000000 +0100 @@ -2,17 +2,17 @@ Section: web Priority: optional Maintainer: Debian Javascript Maintainers <[email protected]> -Uploaders: Daniel Pocock <[email protected]> +Uploaders: Daniel Pocock <[email protected]> Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://www.drucall.org -Vcs-Browser: http://git.debian.org/?p=pkg-javascript/drupal7-mod-drucall.git -Vcs-Git: git://git.debian.org/git/pkg-javascript/drupal7-mod-drucall.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/drupal7-mod-drucall.git +Vcs-Git: git://anonscm.debian.org/pkg-javascript/drupal7-mod-drucall.git Package: drupal7-mod-drucall Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, drupal7-mod-jscommunicator +Depends: ${misc:Depends}, drupal7-mod-jscommunicator (>= 1.1) Recommends: javascript-common Suggests: repro (>= 1.9.0), resiprocate-turn-server | rfc5766-turn-server Description: WebRTC SIP module for the Drupal CMS diff -Nru drupal7-mod-drucall-2.0.1/drucall.admin.inc drupal7-mod-drucall-2.1/drucall.admin.inc --- drupal7-mod-drucall-2.0.1/drucall.admin.inc 2014-02-04 21:27:37.000000000 +0100 +++ drupal7-mod-drucall-2.1/drucall.admin.inc 2014-11-06 19:08:37.000000000 +0100 @@ -33,6 +33,20 @@ '#description' => t('Whether or not to show a button allowing a video call.'), ); + $form['enable_chat'] = array( + '#type' => 'checkbox', + '#title' => t('Show chat panel'), + '#default_value' => variable_get('enable_chat', true), + '#description' => t('Whether or not to show the chat messaging facility.'), + ); + + $form['enable_dtmf_pad'] = array( + '#type' => 'checkbox', + '#title' => t('Show DTMF panel in-call'), + '#default_value' => variable_get('enable_dtmf_pad', true), + '#description' => t('Whether or not to show a DTMF dialing pad during calls.'), + ); + $form['display_name'] = array( '#type' => 'textfield', '#title' => t('Display name for caller'), @@ -140,6 +154,8 @@ variable_set('default_destination', $form_state['values']['default_destination']); variable_set('enable_audio', $form_state['values']['enable_audio']); variable_set('enable_video', $form_state['values']['enable_video']); + variable_set('enable_chat', $form_state['values']['enable_chat']); + variable_set('enable_dtmf_pad', $form_state['values']['enable_dtmf_pad']); variable_set('display_name', $form_state['values']['display_name']); variable_set('from_uri', $form_state['values']['from_uri']); variable_set('auth_user', $form_state['values']['auth_user']); diff -Nru drupal7-mod-drucall-2.0.1/drucall.info drupal7-mod-drucall-2.1/drucall.info --- drupal7-mod-drucall-2.0.1/drucall.info 2014-02-04 21:27:37.000000000 +0100 +++ drupal7-mod-drucall-2.1/drucall.info 2014-11-06 19:13:05.000000000 +0100 @@ -2,8 +2,13 @@ description = WebRTC SIP client for Drupal. package = DruCall core = 7.x -dependencies[] = jssip dependencies[] = jscommunicator -dependencies[] = arbiterjs configure = admin/config/drucall/settings + +; Information added by Drupal.org packaging script on 2014-11-06 +version = "7.x-2.1" +core = "7.x" +project = "drucall" +datestamp = "1415297585" + diff -Nru drupal7-mod-drucall-2.0.1/drucall.module drupal7-mod-drucall-2.1/drucall.module --- drupal7-mod-drucall-2.0.1/drucall.module 2014-02-04 21:27:37.000000000 +0100 +++ drupal7-mod-drucall-2.1/drucall.module 2014-11-06 19:08:37.000000000 +0100 @@ -47,9 +47,11 @@ function drucall_call() { + global $language; + // We use the `libraries' module to load javascript dependencies: - foreach ([ "jssip", "jscommunicator", "arbiterjs" ] as $libname) { + foreach ([ "jssip", "jscommunicator", "arbiterjs", "jqueryi18nproperties", "fontawesome" ] as $libname) { if (!($library = libraries_detect($libname))) { $error = "failed to load an essential component"; $error_msg = "failed to load $libname - please install it (check the DruCall instructions)"; @@ -70,6 +72,8 @@ 'phone_number' => variable_get('default_destination'), 'enable_audio' => variable_get('enable_audio'), 'enable_video' => variable_get('enable_video'), + 'enable_chat' => variable_get('enable_chat'), + 'enable_dtmf_pad' => variable_get('enable_dtmf_pad'), 'display_name' => variable_get('display_name'), 'impi' => variable_get('auth_user'), 'impu' => variable_get('from_uri'), @@ -80,6 +84,7 @@ 'turn_server_url' => variable_get('turn_server_url'), 'turn_username' => variable_get('turn_username'), 'turn_password' => variable_get('turn_password'), + 'language_code' => $language->language, ); drupal_add_js( diff -Nru drupal7-mod-drucall-2.0.1/drucall-phone.tpl.php drupal7-mod-drucall-2.1/drucall-phone.tpl.php --- drupal7-mod-drucall-2.0.1/drucall-phone.tpl.php 2014-02-04 21:27:37.000000000 +0100 +++ drupal7-mod-drucall-2.1/drucall-phone.tpl.php 2014-11-06 19:08:37.000000000 +0100 @@ -16,7 +16,127 @@ it is completely valid to include the <script> elements in the HTML body where you include the HTML fragement from this file --> -<div id="network-controls"> +<div id="encapsulate"> + <div id="header"> + <select id="lang_selection"> + <option value="en">Select a language</option> + </select> + <i class="fa fa-power-off" id="jsc-logout-button"></i> + <h1>JSCommunicator</h1> + <span id="welcome"></span><span id="welcome_name"></span> + </div> + <div id="network-controls"> + <div id="jsc-login"> + <div id="jsc-login-display-name"> + <span class="jsc-login-label">Display name (may be empty)</span> + <input type="text" id="jsc-login-display-name-field"/> + </div> + <div id="jsc-login-sip-uri"> + <span class="jsc-login-label">SIP address</span> + <input type="text" id="jsc-login-sip-address-field"/> + </div> + <div id="jsc-login-password"> + <span class="jsc-login-label">Password</span> + <input type="password" id="jsc-login-password-field"/> + </div> + <div id="jsc-login-option"> + <input type="checkbox" id="rememberMe"><span id="remember-label">Remember me</span><br> + </div> + <input type="button" value="Login" id="jsc-login-button"/> + </div> + </div> + + <div id="communicator"> + <div id="call"> + <h3>Call</h3> + <div id="call-info"> + <span class="no-contact" id="call-contact-error">Please enter a contact.</span> + <div id="state"> + <span class="session-outgoing">Dialing...</span> + <span class="session-incoming">Incoming call</span> + <span class="session-accepted">Answering, connectivity checks in progress...</span> + <span class="session-active">Call connected</span> + </div> + </div> + + <div id="dial-controls" class="ws-connected"> + <div id="dest"> + <span id="dest_label">Destination:</span> + <input type="text" id="address" placeholder="Enter contact"/> + </div> + <div id="dialing-actions"> + <button id="call-audio"><i class="fa fa-phone fa-lg" style="color:green;"></i></button> + <button id="call-video"><i class="fa fa-video-camera fa-lg" style="color:green;"></i></button> + </div> + </div> + + <div id="session-controls" class="ws-connected in-call"> + <div id="peer"></div> + <div id="session-actions"> + <button value="Cancel" id="session-cancel" class="session-outgoing"> + <i class="fa fa-phone fa-lg red-phone" ></i> + </button> + <button value="Reject" id="session-reject" class="session-incoming"> + <i class="fa fa-phone fa-lg red-phone" style="color:red;"></i> + </button> + <button value="Answer" id="session-answer" class="session-incoming"> + <i class="fa fa-phone fa-lg" style="color:green;"></i> + </button> + <button value="Answer (with video)" id="session-answer-video" class="session-incoming"> + <i class="fa fa-video-camera fa-lg" style="color:green;"></i> + </button> + <!-- Not implemented yet? + <button value="Hold" id="session-hold" class="session-active" disabled> + <i class="fa fa-pause fa-lg" style="color:red;"></i> + </button>--> + <button value="Hangup" id="session-hangup" class="session-active"> + <i class="fa fa-phone fa-lg red-phone" style="color:red;"></i> + </button> + <button id="dtmf-button" class="session-active"> + <i class="fa fa-th fa-lg" style="color:darkblue;"></i> + </button> + </div> + </div> + <div id="dtmf-pad"> + <input type="button" value="1" class="dtmf-number"/> + <input type="button" value="2" class="dtmf-number"/> + <input type="button" value="3" class="dtmf-number"/> + <input type="button" value="A" class="dtmf-symbol"/> + <br/> + <input type="button" value="4" class="dtmf-number"/> + <input type="button" value="5" class="dtmf-number"/> + <input type="button" value="6" class="dtmf-number"/> + <input type="button" value="B" class="dtmf-symbol"/> + <br/> + <input type="button" value="7" class="dtmf-number"/> + <input type="button" value="8" class="dtmf-number"/> + <input type="button" value="9" class="dtmf-number"/> + <input type="button" value="C" class="dtmf-symbol"/> + <br/> + <input type="button" value="*" class="dtmf-symbol"/> + <input type="button" value="0" class="dtmf-number"/> + <input type="button" value="#" class="dtmf-symbol"/> + <input type="button" value="D" class="dtmf-symbol"/> + <br/> + </div> + </div> + <hr> + <div id="chat"> + <h3>Chat</h3> + <div id="chat-error"> + <span class="no-contact" id="chat-contact-error">Please enter a contact.</span> + </div> + <div id="new-chat"> + <span id="chat_dest_label">Destination:</span> + <input type="text" id="chat-address" placeholder="Enter contact"/> + <button id="start-chat"><i class="fa fa-comments fa-lg" style="color:darkblue;"></i></button> + </div> + <ul id="tab-labels"> + </ul> + <div id="tab-pages"> + </div> + </div> + </div> <div id="error"> <span id="js">ERROR: This service requires JavaScript. Please enable JavaScript in your web browser settings.</span> @@ -27,29 +147,11 @@ <span id="call-attempt-failed">ERROR: failed to start call, check that microphone/webcam are connected, check browser security settings, peer may not support compatible codecs</span> <span id="dynamic"></span> </div> - - <div id="jsc-login"> - <div id="jsc-login-display-name"> - <span class="jsc-login-label">Display name (may be empty)</span> - <input type="text" id="jsc-login-display-name-field"/> - </div> - <div id="jsc-login-sip-uri"> - <span class="jsc-login-label">SIP address</span> - <span>sip:<input type="text" id="jsc-login-sip-address-field"/></span> - </div> - <div id="jsc-login-password"> - <span class="jsc-login-label">Password</span> - <input type="password" id="jsc-login-password-field"/> - </div> - <input type="button" value="Login" id="jsc-login-button"/> - </div> - <div id="ws"> - <span>WebSocket link:</span> + <span id="ws_link">WebSocket link:</span> <span id="connected" class="state ws-connected">Connected</span> <span id="disconnected" class="state ws-disconnected">Disconnected</span> </div> - <div id="reg" class="ws-connected up down"><span>SIP registration:</span> <span id="state"> <span class="up">Registered</span> @@ -60,61 +162,16 @@ <input type="button" value="De-Register" id="de-reg-button" class="up"/> </span> </div> + </div> - -<div id="dial-controls" class="ws-connected"> - <div id="dest"> - <span>Destination:</span> - <input type="text" id="address"/> - </div> - <div id="dialing-actions"> - <input type="button" value="Call (audio only)" id="call-audio"/> - <input type="button" value="Call (audio and video)" id="call-video"/> - </div> -</div> - -<div id="session-controls" class="ws-connected in-call"> - <div id="state"> - <span class="session-outgoing">Dialing...</span> - <span class="session-incoming">Incoming call</span> - <span class="session-accepted">Answering, connectivity checks in progress...</span> - <span class="session-active">Call connected</span> - </div> - <div id="peer"></div> - <div id="session-actions"> - <input type="button" value="Cancel" id="session-cancel" class="session-outgoing"/> - <input type="button" value="Reject" id="session-reject" class="session-incoming"/> - <input type="button" value="Answer" id="session-answer" class="session-incoming"/> - <input type="button" value="Answer (with video)" id="session-answer-video" class="session-incoming"/> - <input type="button" value="Hold" id="session-hold" class="session-active" disabled/> - <input type="button" value="Hangup" id="session-hangup" class="session-active"/> - </div> - <div id="dtmf-pad" class="session-active"> - <input type="button" value="1" class="dtmf-number"/> - <input type="button" value="2" class="dtmf-number"/> - <input type="button" value="3" class="dtmf-number"/> - <br/> - <input type="button" value="4" class="dtmf-number"/> - <input type="button" value="5" class="dtmf-number"/> - <input type="button" value="6" class="dtmf-number"/> - <br/> - <input type="button" value="7" class="dtmf-number"/> - <input type="button" value="8" class="dtmf-number"/> - <input type="button" value="9" class="dtmf-number"/> - <br/> - <input type="button" value="*" class="dtmf-symbol"/> - <input type="button" value="0" class="dtmf-number"/> - <input type="button" value="#" class="dtmf-symbol"/> - </div> -</div> - + <div id="video-session" class="ws-connected in-call"> - <video id="remoteView" autoplay></video> - <video id="selfView" autoplay></video> + <video id="remoteView" autoplay controls></video> + <video id="selfView" autoplay muted></video> <div id="video-controls"> <input type="button" value="Self view" id="video-control-self-view" class="self"/> <input type="button" value="Self hide" id="video-control-self-hide" class="self"/> - <input type="button" value="Full screen" id="video-control-fullscreen" disabled/> </div> </div> + diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_bg.properties drupal7-mod-drucall-2.1/internationalization/Messages_bg.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_de.properties drupal7-mod-drucall-2.1/internationalization/Messages_de.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_en.properties drupal7-mod-drucall-2.1/internationalization/Messages_en.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_es.properties drupal7-mod-drucall-2.1/internationalization/Messages_es.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_fr.properties drupal7-mod-drucall-2.1/internationalization/Messages_fr.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_he.properties drupal7-mod-drucall-2.1/internationalization/Messages_he.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_nl.properties drupal7-mod-drucall-2.1/internationalization/Messages_nl.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_pl.properties drupal7-mod-drucall-2.1/internationalization/Messages_pl.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages.properties drupal7-mod-drucall-2.1/internationalization/Messages.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_pt.properties drupal7-mod-drucall-2.1/internationalization/Messages_pt.properties diff -Nru drupal7-mod-drucall-2.0.1/internationalization/Messages_sk.properties drupal7-mod-drucall-2.1/internationalization/Messages_sk.properties diff -Nru drupal7-mod-drucall-2.0.1/js/drucall.js drupal7-mod-drucall-2.1/js/drucall.js --- drupal7-mod-drucall-2.0.1/js/drucall.js 2014-02-04 21:27:37.000000000 +0100 +++ drupal7-mod-drucall-2.1/js/drucall.js 2014-11-06 19:08:37.000000000 +0100 @@ -57,12 +57,35 @@ video_dialing: dcsettings.enable_video, // Whether to offer a video call button prefer_video: false, // If user presses Enter to dial, use video? no_answer_timeout: 60, // How long to wait for answer (seconds) + clear_dialbox: false // Whether to clear dialbox after call/attempted call + }, + + chat : { + enable: dcsettings.enable_chat // Whether to show chat functions }, session : { - show_dtmf_pad : false, // Whether to show a DTMF dialpad during calls + show_dtmf_pad : dcsettings.enable_dtmf_pad, // Whether to show a DTMF dialpad during calls + dtmf_duration : 160, // Duration (ms) to signal a DTMF press + dialpad_tone: true, // Whether to play sound after pressing dialpad button + message_tone: true, // Whether to alert (sound) when new IM is received + require_relay_candidate: false // Whether to abort calls if no + // relay candidate found in the SDP + // generated by the browser. + // If a TURN server had been configured, + // the lack of a relay candidate is + // likely to be a sign that UDP is blocked + }, + + i18n : { + translate: true, // enables the call to i18n init function from JSCommManager.init() + show_menu: true, // show the language chooser menu + default_lang: dcsettings.language_code // default language to use }, + extra_headers : [ + // 'X-WS-Session-Extra: some_token=value' + ] }; diff -Nru drupal7-mod-drucall-2.0.1/LICENSE.txt drupal7-mod-drucall-2.1/LICENSE.txt --- drupal7-mod-drucall-2.0.1/LICENSE.txt 1970-01-01 01:00:00.000000000 +0100 +++ drupal7-mod-drucall-2.1/LICENSE.txt 2014-09-23 21:24:50.000000000 +0200 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -Nru drupal7-mod-drucall-2.0.1/skin.css drupal7-mod-drucall-2.1/skin.css --- drupal7-mod-drucall-2.0.1/skin.css 1970-01-01 01:00:00.000000000 +0100 +++ drupal7-mod-drucall-2.1/skin.css 2014-11-06 19:08:37.000000000 +0100 @@ -0,0 +1,45 @@ +span { + color:#FFF; + } + + #peer { + color:#FFF; +} + +#lang_selection { + background-color: #888; + color:#FFF; +} + +#communicator { + border-radius: 6px; + border-style: solid; + border-color: #FFF; + border-width: 1px; +} + +#dtmf-pad { + border: 1px solid #FFF; + opacity: 0.8; +} + +#encapsulate { + background-color: #888; + border-radius: 6px; +} + +#error span, #ws span, #reg span { + color: white; +} + +#header h1 { + color: white; +} + +#jsc-logout-button { + color: #FFF; +} + +h3 { + color: white; +} \ No newline at end of file Binary files /tmp/WxDVnjmkAM/drupal7-mod-drucall-2.0.1/sounds/new_message.ogg and /tmp/SQNaBXELq4/drupal7-mod-drucall-2.1/sounds/new_message.ogg differ Binary files /tmp/WxDVnjmkAM/drupal7-mod-drucall-2.0.1/sounds/new_message.wav and /tmp/SQNaBXELq4/drupal7-mod-drucall-2.1/sounds/new_message.wav differ
