Fix typo in README

fda243e2 · davide · 595495b0 · fda243e2 · fda243e2 · fda243e2
Commit fda243e2 authored Mar 02, 2016 by davide
14 changed files
--- a/README.md
+++ b/README.md
@@ -4,4 +4,4 @@ domotikad
 To change git origin:
 * git remote rm origin
 * git remote add origin https://git.nexlab.net/nexlab/domotikad.git
- * git branch --set-upstream master origin/
+ * git branch --set-upstream master origin/master
--- a/Web/admin/index.php
+++ b/Web/admin/index.php
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
  <head>
-    <title>Domotika Admin Dashboard</title>
+    <title>WEBHOUSE Admin Dashboard</title>
    <? include("parts/head.php");?>
  </head>
  <body>
@@ -82,7 +82,7 @@
            <h4 class="modal-title">Board Autodetection</h4>
          </div>
          <div class="modal-body">
-            <b>WARNING: </b>you are starting Domotika Boards autodetection procedure. This will
+            <b>WARNING: </b>you are starting WEBHOUSE Boards autodetection procedure. This will
                            delete any dynamic board in the Domotika database and then
                            they will be re-detected. Any change you have made on inputs
                            or outputs, any reference to ID of inputs and outputs will be 
@@ -105,7 +105,7 @@
            <h4 class="modal-title">Board IOConf Sync</h4>
          </div>
          <div class="modal-body">
-            <b>WARNING: </b>you are starting Domotika Boards I/O Sync procedure. This will
+            <b>WARNING: </b>you are starting WEBHOUSE Boards I/O Sync procedure. This will
                            delete any saved board I/O Config in the Domotika database and then
                            they will be re-loaded from the Domotika boards.
                            Any change will be losed.
@@ -186,7 +186,7 @@
         <h3 class="panel-title">Last news</h3>
      </div>
      <div class="home-panel">
-         <h3>Benvenuti in Domotika!</h3>
+         <h3>Benvenuti in WEBHOUSE</h3>
         <p>Grazie per aver scelto il piu' avanzato sistema domotico esistente!
         </p>
      </div>

--- a/Web/htdocs/gmi/index.php
+++ b/Web/htdocs/gmi/index.php
@@ -50,7 +50,7 @@ foreach($panels as $panel) {
 ?>
 <html>
 <head>
-<title>Domotika GMI Interface</title>
+<title>WEBHOUSE GMI Interface</title>
 <link rel="stylesheet" href="/resources/pure/pure-nr-min.css">
 <link rel="stylesheet" href="/resources/fontawesome/css/font-awesome.min.css">
 <link href='style.css' type='text/css' rel='stylesheet'>

--- a/Web/htdocs/gui/js/domotika.js
+++ b/Web/htdocs/gui/js/domotika.js
@@ -661,7 +661,7 @@
         $("#notifyid-"+nt.nid).animate({backgroundColor: "#0080ff"},200);
         $("#notifyid-"+nt.nid).animate({backgroundColor: notifyColor},3500);
      }
-      playTTS("nuova notifica,"+nt.msg);
+      playTTS("attenzione"+nt.msg);
      
   };


--- a/Web/htdocs/gui/parts/footbar.php
+++ b/Web/htdocs/gui/parts/footbar.php
@@ -10,8 +10,8 @@ if($_DOMOTIKA['gui_theme']=='dmblack')

 ?>
 <div class="navbar <?=$themeclass?> navbar-fixed-bottom">
-   <a class="navbar-brand" href="http://www.unixmedia.it" target=_blank>Domotika</a>
-   <p class="navbar-text hidden-sm"><a href="http://www.unixmedia.it" class="navbar-link" target=_blank>by Unixmedia</a></p>
+   <a class="navbar-brand" href="http://www.i-motika.com" target=_blank>WEBHOUSE</a>
+   <p class="navbar-text hidden-sm"><a href="http://www.i-motika.com" class="navbar-link" target=_blank>by I-motika</a></p>
   <button id="speechbutton" type="button" class="btn btn-default navbar-btn pull-right speechbutton"></button>
   <form id="speech" class="navbar-form footbar-form hidden-sm text-on-white-theme-<?=$_DOMOTIKA['gui_theme']?>"> 
      <input type="text" id="speechinp" name="text" value="" class="form-control" <?=$webspeech?> lang="<?=$_DOMOTIKA['speechlang']?>" placeholder="Command">

--- a/Web/htdocs/gui/parts/head.php
+++ b/Web/htdocs/gui/parts/head.php
@@ -2,7 +2,7 @@
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <title>Domotika GUI - <?=$tr->Get($GUISECTION)?></title>
+    <title>WEBHOUSE GUI - <?=$tr->Get($GUISECTION)?></title>


    <!-- Allow fullscreen mode on iOS devices. (These are Apple specific meta tags.) -->

--- a/Web/htdocs/gui/parts/navbar.php
+++ b/Web/htdocs/gui/parts/navbar.php
@@ -25,7 +25,7 @@ if($_DOMOTIKA['gui_theme']=='dmblack')
      <i class="glyphicon glyphicon-indent-left"></i>
    </button>
   <? } ?>
-    <p class="navbar-title hidden-sm" data-domotika-dragger="true">Domotika GUI - <?=$tr->Get($GUISECTION)?></p>
+    <p class="navbar-title hidden-sm" data-domotika-dragger="true">LA CASA DI CINZIA - <?=$tr->Get($GUISECTION)?></p>
    <p class="navbar-title visible-sm"><?=$tr->Get($GUISECTION)?></p>
   <? if($right) { ?>
    <button id="open-right" type="button" class="navbar-open navbar-openright">
@@ -41,7 +41,7 @@ if($_DOMOTIKA['gui_theme']=='dmblack')
             <? if($GUISECTION!="settings") { ?>
             <li><a href="<?=$BASEGUIPATH?>/settings">Settings</a></li>
             <? } else { ?>
-             <li><a href="<?=$BASEGUIPATH?>"/>Domotika GUI</a></li>
+             <li><a href="<?=$BASEGUIPATH?>"/>WEBHOUSE GUI</a></li>
             <? } ?>
             <li><a href="/admin/">admin gui</a></li>
             <li id="install_ff" style="display:none"><a id="installbutton">install as webapp</a></li>

--- a/Web/htdocs/gui/right/index.php
+++ b/Web/htdocs/gui/right/index.php
@@ -6,7 +6,7 @@
         <a href="<?=$BASEGUIPATH."/clima"?>" data-guisection='clima' class="btn btn-block btn-default rightbtn rightbtn-clima">Clima</a>
         <a href="<?=$BASEGUIPATH."/video"?>" data-guisection='video' class="btn btn-block btn-default rightbtn rightbtn-tv">Video & TV</a>
         <a href="<?=$BASEGUIPATH."/cameras"?>" data-guisection='cameras' class="btn btn-block btn-default rightbtn rightbtn-video">Telecamere</a>
-         <a href="<?=$BASEGUIPATH."/stats"?>" data-guisection='stats' class="btn btn-block btn-default rightbtn rightbtn-stats">Stats</a>
+         <a href="<?=$BASEGUIPATH."/stats"?>" data-guisection='stats' class="btn btn-block btn-default rightbtn rightbtn-stats">Statistiche</a>
         <!--
         <a href="<?=$BASEGUIPATH."/alarm"?>" data-guisection='alarm' class="btn btn-block btn-default rightbtn rightbtn-alarm">Antifurto</a>
         <a href="<?=$BASEGUIPATH."/audio"?>" data-guisection='audio' class="btn btn-block btn-default rightbtn rightbtn-audio">Audio</a>

--- a/Web/htdocs/index.php
+++ b/Web/htdocs/index.php
@@ -2,8 +2,8 @@
 include_once("common_includes.php");
 ?>
 <html>
-<head title="Domotika GUI">
-   <title>Domotika GUI</title>
+<head title="WEBHOUSE GUI">
+   <title>WEBHOUSE GUI</title>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta content="true" name="HandheldFriendly" />

--- a/Web/htdocs/stats/index.php
+++ b/Web/htdocs/stats/index.php
@@ -2,8 +2,8 @@
 include_once("common_includes.php");
 ?>
 <html>
-<head title="Domotika GUI stats">
-   <title>Domotika GUI Stats</title>
+<head title="WEBHOUSE GUI stats">
+   <title>WEBHOUSE GUI Stats</title>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta content="true" name="HandheldFriendly" />

--- a/Web/resources/login.html
+++ b/Web/resources/login.html
 <html>
 <head>
-<title>Domotika By Unixmedia</title>
+<title>WEBHOUSE By I-motika</title>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=0.85, maximum-scale=0.85, minimum-scale=0.85, user-scalable=no" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=0.85" />
@@ -192,12 +192,11 @@ img {
 </style>
 @SCRIPT@
 </head>
-
 <body class="@THEME@">
 <div id="login" class="@THEME@" >
-<img src="/img/logo_unixmedia_@THEME@.png">
+<img src="/img/logo_login.png">
 <form name="loginform" id="login" class="login @THEME@" action="@PATH@" method="post">
-   <h4>Domotika Login</h4>
+   <h4>Imoika Login</h4>
   <p>
      <label for="user_login">Username<br />
      <input type="text" name="username" id="user_login" class="input" value="@USERNAME@" size="20" /></label>

--- a/asterisk/utils/defaults/domotika_internal.dialplan
+++ b/asterisk/utils/defaults/domotika_internal.dialplan
@@ -25,6 +25,8 @@ exten => _222,1,Answer()
 exten => _222,2,Echo()
 exten => _223,1,Answer()
 exten => _223,2,Record(/tmp/prova:sln,3,15)
+exten => _2XX,1,Dial(SIP/trunk-nexlab/${EXTEN},,rtTwWkKh)
+exten => 2XX,1,Dial(SIP/trunk-nexlab/${EXTEN},,rtTwWkKh)
 exten => _X.,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal)
 exten => _X.,n,Goto(domotika_out,${EXTEN},1)
 exten => _[a-z].,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal)

--- a/asterisk/utils/defaults/domotika_users.dialplan
+++ b/asterisk/utils/defaults/domotika_users.dialplan
@@ -23,6 +23,7 @@

 exten => _X.,2,Dial(SIP/${EXTEN},${TIMEOUT_USERS},rtTwWkKh)
 exten => _X.,3,Hangup()
+exten => _2XX,1,Dial(SIP/trunk-nexlab/${EXTEN},,rtTwWkKh)
 exten => _[a-z].,2,Dial(SIP/${EXTEN},${TIMEOUT_USERS},rtTwWkKh)
 exten => _[a-z].,2,Hangup()
 exten => _[A-Z].,2,Dial(SIP/${EXTEN},${TIMEOUT_USERS},rtTwWkKh)

--- a/domotika/web/web.py
+++ b/domotika/web/web.py
@@ -482,7 +482,7 @@ class LoginPage(rend.Page):
   addSlash = True

   html="""<html><head>
-<title>Domotika By Unixmedia</title>
+<title>WEBHOUSE By I-motika</title>
 @SCRIPT@
 </head>
 <body class="@THEME@">