Permalink
Browse files

Final fixes for SmartMesk SDK 1.1.2.0

  • Loading branch information...
twatteynelinear committed Apr 2, 2017
1 parent ea67300 commit 09119db085fe6aaaedef9cd69a07ad294f0f14fa
Showing with 13 additions and 8 deletions.
  1. +8 −3 app/JsonServer/JsonServer.py
  2. +1 −1 app/SeeTheMesh/static/style.css
  3. +4 −4 app/SeeTheMesh/views/index.tpl
@@ -895,7 +895,10 @@ def _managers_PUT(self,newmanagers):
def _managers_DELETE(self,oldmanagers):
with self.dataLock:
for m in oldmanagers:
self.config['managers'].remove(m)
try:
self.config['managers'].remove(m)
except ValueError:
pass # happens when manager doesn't exist
self._saveConfig()
self._syncManagers()
@@ -970,7 +973,7 @@ def _send_notif(self,notifname,jsonToSend):
# send notifications
if urls:
for url in urls:
threading.Thread(
notifthread = threading.Thread(
target = self._send_notif_thread,
args = (
url,
@@ -981,7 +984,9 @@ def _send_notif(self,notifname,jsonToSend):
'Content-type': 'application/json',
},
}
).start()
)
notifthread.name = '{0}->{1}'.format(notifname,url)
notifthread.start()
def _send_notif_thread(self,*args,**kwargs):
try:
@@ -2,7 +2,7 @@ body {
margin: 0 auto;
color: #333;
font-weight: 300;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serf;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
background-image: url(/static/background.jpg);
background-repeat: repeat;
}
@@ -56,15 +56,15 @@
// pagetitle
$('#pagetitle').offset(
{
top: 50,
left: 70
top: 20,
left: 20
}
);
// version
$('#version').offset(
{
top: $(window).height()-80-20,
left: 70
top: $(window).height()-60,
left: 20
}
);
// logo

0 comments on commit 09119db

Please sign in to comment.