Skip to content

Commit 09119db

Browse files
committed
Final fixes for SmartMesk SDK 1.1.2.0
1 parent ea67300 commit 09119db

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

Diff for: app/JsonServer/JsonServer.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,10 @@ def _managers_PUT(self,newmanagers):
895895
def _managers_DELETE(self,oldmanagers):
896896
with self.dataLock:
897897
for m in oldmanagers:
898-
self.config['managers'].remove(m)
898+
try:
899+
self.config['managers'].remove(m)
900+
except ValueError:
901+
pass # happens when manager doesn't exist
899902
self._saveConfig()
900903
self._syncManagers()
901904

@@ -970,7 +973,7 @@ def _send_notif(self,notifname,jsonToSend):
970973
# send notifications
971974
if urls:
972975
for url in urls:
973-
threading.Thread(
976+
notifthread = threading.Thread(
974977
target = self._send_notif_thread,
975978
args = (
976979
url,
@@ -981,7 +984,9 @@ def _send_notif(self,notifname,jsonToSend):
981984
'Content-type': 'application/json',
982985
},
983986
}
984-
).start()
987+
)
988+
notifthread.name = '{0}->{1}'.format(notifname,url)
989+
notifthread.start()
985990

986991
def _send_notif_thread(self,*args,**kwargs):
987992
try:

Diff for: app/SeeTheMesh/static/style.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ body {
22
margin: 0 auto;
33
color: #333;
44
font-weight: 300;
5-
font-family: "Helvetica Neue", Helvetica, Arial, sans-serf;
5+
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
66
background-image: url(/static/background.jpg);
77
background-repeat: repeat;
88
}

Diff for: app/SeeTheMesh/views/index.tpl

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@
5656
// pagetitle
5757
$('#pagetitle').offset(
5858
{
59-
top: 50,
60-
left: 70
59+
top: 20,
60+
left: 20
6161
}
6262
);
6363
// version
6464
$('#version').offset(
6565
{
66-
top: $(window).height()-80-20,
67-
left: 70
66+
top: $(window).height()-60,
67+
left: 20
6868
}
6969
);
7070
// logo

0 commit comments

Comments
 (0)