Skip to content

D
domotikad
Commit fda243e2 authored by davide's avatar davide
Browse files
Options

Fix typo in README

parent 595495b0
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 22 deletions
README.md
View file @ fda243e2
...@@ -4,4 +4,4 @@ domotikad ...@@ -4,4 +4,4 @@ domotikad
To change git origin: To change git origin:
* git remote rm origin * git remote rm origin
* git remote add origin https://git.nexlab.net/nexlab/domotikad.git * git remote add origin https://git.nexlab.net/nexlab/domotikad.git
* git branch --set-upstream master origin/ * git branch --set-upstream master origin/master
Web/admin/index.php
View file @ fda243e2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Domotika Admin Dashboard</title> <title>WEBHOUSE Admin Dashboard</title>
<? include("parts/head.php");?> <? include("parts/head.php");?>
</head> </head>
<body> <body>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<h4 class="modal-title">Board Autodetection</h4> <h4 class="modal-title">Board Autodetection</h4>
</div> </div>
<div class="modal-body"> <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 delete any dynamic board in the Domotika database and then
they will be re-detected. Any change you have made on inputs they will be re-detected. Any change you have made on inputs
or outputs, any reference to ID of inputs and outputs will be or outputs, any reference to ID of inputs and outputs will be
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<h4 class="modal-title">Board IOConf Sync</h4> <h4 class="modal-title">Board IOConf Sync</h4>
</div> </div>
<div class="modal-body"> <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 delete any saved board I/O Config in the Domotika database and then
they will be re-loaded from the Domotika boards. they will be re-loaded from the Domotika boards.
Any change will be losed. Any change will be losed.
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<h3 class="panel-title">Last news</h3> <h3 class="panel-title">Last news</h3>
</div> </div>
<div class="home-panel"> <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>Grazie per aver scelto il piu' avanzato sistema domotico esistente!
</p> </p>
</div> </div>
......
Web/htdocs/gmi/index.php
View file @ fda243e2
...@@ -50,7 +50,7 @@ foreach($panels as $panel) { ...@@ -50,7 +50,7 @@ foreach($panels as $panel) {
?> ?>
<html> <html>
<head> <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/pure/pure-nr-min.css">
<link rel="stylesheet" href="/resources/fontawesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/resources/fontawesome/css/font-awesome.min.css">
<link href='style.css' type='text/css' rel='stylesheet'> <link href='style.css' type='text/css' rel='stylesheet'>
......
Web/htdocs/gui/js/domotika.js
View file @ fda243e2
...@@ -661,7 +661,7 @@ ...@@ -661,7 +661,7 @@
$("#notifyid-"+nt.nid).animate({backgroundColor: "#0080ff"},200); $("#notifyid-"+nt.nid).animate({backgroundColor: "#0080ff"},200);
$("#notifyid-"+nt.nid).animate({backgroundColor: notifyColor},3500); $("#notifyid-"+nt.nid).animate({backgroundColor: notifyColor},3500);
} }
playTTS("nuova notifica,"+nt.msg); playTTS("attenzione"+nt.msg);
}; };
......
Web/htdocs/gui/parts/footbar.php
View file @ fda243e2
...@@ -10,8 +10,8 @@ if($_DOMOTIKA['gui_theme']=='dmblack') ...@@ -10,8 +10,8 @@ if($_DOMOTIKA['gui_theme']=='dmblack')
?> ?>
<div class="navbar <?=$themeclass?> navbar-fixed-bottom"> <div class="navbar <?=$themeclass?> navbar-fixed-bottom">
<a class="navbar-brand" href="http://www.unixmedia.it" target=_blank>Domotika</a> <a class="navbar-brand" href="http://www.i-motika.com" target=_blank>WEBHOUSE</a>
<p class="navbar-text hidden-sm"><a href="http://www.unixmedia.it" class="navbar-link" target=_blank>by Unixmedia</a></p> <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> <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']?>"> <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"> <input type="text" id="speechinp" name="text" value="" class="form-control" <?=$webspeech?> lang="<?=$_DOMOTIKA['speechlang']?>" placeholder="Command">
......
Web/htdocs/gui/parts/head.php
View file @ fda243e2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<meta charset="UTF-8" /> <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 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" /> <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.) --> <!-- Allow fullscreen mode on iOS devices. (These are Apple specific meta tags.) -->
......
Web/htdocs/gui/parts/navbar.php
View file @ fda243e2
...@@ -25,7 +25,7 @@ if($_DOMOTIKA['gui_theme']=='dmblack') ...@@ -25,7 +25,7 @@ if($_DOMOTIKA['gui_theme']=='dmblack')
<i class="glyphicon glyphicon-indent-left"></i> <i class="glyphicon glyphicon-indent-left"></i>
</button> </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> <p class="navbar-title visible-sm"><?=$tr->Get($GUISECTION)?></p>
<? if($right) { ?> <? if($right) { ?>
<button id="open-right" type="button" class="navbar-open navbar-openright"> <button id="open-right" type="button" class="navbar-open navbar-openright">
...@@ -41,7 +41,7 @@ if($_DOMOTIKA['gui_theme']=='dmblack') ...@@ -41,7 +41,7 @@ if($_DOMOTIKA['gui_theme']=='dmblack')
<? if($GUISECTION!="settings") { ?> <? if($GUISECTION!="settings") { ?>
<li><a href="<?=$BASEGUIPATH?>/settings">Settings</a></li> <li><a href="<?=$BASEGUIPATH?>/settings">Settings</a></li>
<? } else { ?> <? } 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><a href="/admin/">admin gui</a></li>
<li id="install_ff" style="display:none"><a id="installbutton">install as webapp</a></li> <li id="install_ff" style="display:none"><a id="installbutton">install as webapp</a></li>
......
Web/htdocs/gui/right/index.php
View file @ fda243e2
...@@ -6,7 +6,7 @@ ...@@ -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."/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."/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."/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."/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 href="<?=$BASEGUIPATH."/audio"?>" data-guisection='audio' class="btn btn-block btn-default rightbtn rightbtn-audio">Audio</a>
......
Web/htdocs/index.php
View file @ fda243e2
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
include_once("common_includes.php"); include_once("common_includes.php");
?> ?>
<html> <html>
<head title="Domotika GUI"> <head title="WEBHOUSE GUI">
<title>Domotika GUI</title> <title>WEBHOUSE GUI</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="true" name="HandheldFriendly" /> <meta content="true" name="HandheldFriendly" />
......
Web/htdocs/stats/index.php
View file @ fda243e2
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
include_once("common_includes.php"); include_once("common_includes.php");
?> ?>
<html> <html>
<head title="Domotika GUI stats"> <head title="WEBHOUSE GUI stats">
<title>Domotika GUI Stats</title> <title>WEBHOUSE GUI Stats</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="true" name="HandheldFriendly" /> <meta content="true" name="HandheldFriendly" />
......
Web/resources/login.html
View file @ fda243e2
<html> <html>
<head> <head>
<title>Domotika By Unixmedia</title> <title>WEBHOUSE By I-motika</title>
<meta charset="UTF-8" /> <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 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" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=0.85" />
...@@ -192,12 +192,11 @@ img { ...@@ -192,12 +192,11 @@ img {
</style> </style>
@SCRIPT@ @SCRIPT@
</head> </head>
<body class="@THEME@"> <body class="@THEME@">
<div id="login" 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"> <form name="loginform" id="login" class="login @THEME@" action="@PATH@" method="post">
<h4>Domotika Login</h4> <h4>Imoika Login</h4>
<p> <p>
<label for="user_login">Username<br /> <label for="user_login">Username<br />
<input type="text" name="username" id="user_login" class="input" value="@USERNAME@" size="20" /></label> <input type="text" name="username" id="user_login" class="input" value="@USERNAME@" size="20" /></label>
......
asterisk/utils/defaults/domotika_internal.dialplan
View file @ fda243e2
...@@ -25,6 +25,8 @@ exten => _222,1,Answer() ...@@ -25,6 +25,8 @@ exten => _222,1,Answer()
exten => _222,2,Echo() exten => _222,2,Echo()
exten => _223,1,Answer() exten => _223,1,Answer()
exten => _223,2,Record(/tmp/prova:sln,3,15) 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.,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal)
exten => _X.,n,Goto(domotika_out,${EXTEN},1) exten => _X.,n,Goto(domotika_out,${EXTEN},1)
exten => _[a-z].,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal) exten => _[a-z].,1,AGI(agi://${AGIHOST}:${AGIPORT}/internal)
......
asterisk/utils/defaults/domotika_users.dialplan
View file @ fda243e2
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
exten => _X.,2,Dial(SIP/${EXTEN},${TIMEOUT_USERS},rtTwWkKh) exten => _X.,2,Dial(SIP/${EXTEN},${TIMEOUT_USERS},rtTwWkKh)
exten => _X.,3,Hangup() 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,Dial(SIP/${EXTEN},${TIMEOUT_USERS},rtTwWkKh)
exten => _[a-z].,2,Hangup() exten => _[a-z].,2,Hangup()
exten => _[A-Z].,2,Dial(SIP/${EXTEN},${TIMEOUT_USERS},rtTwWkKh) exten => _[A-Z].,2,Dial(SIP/${EXTEN},${TIMEOUT_USERS},rtTwWkKh)
......
domotika/web/web.py
View file @ fda243e2
...@@ -482,7 +482,7 @@ class LoginPage(rend.Page): ...@@ -482,7 +482,7 @@ class LoginPage(rend.Page):
addSlash = True addSlash = True
html="""<html><head> html="""<html><head>
<title>Domotika By Unixmedia</title> <title>WEBHOUSE By I-motika</title>
@SCRIPT@ @SCRIPT@
</head> </head>
<body class="@THEME@"> <body class="@THEME@">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment