Skip to content

S
skylivex
Commit b71b90e4 authored by Franco (nextime) Lanza's avatar Franco (nextime) Lanza
Browse files
Options

Merge branch 'master' of https://github.com/nextime/skylivex 

Conflicts:
	skylivex.pro.user
parents 8c4c86e7 592c699a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 635 additions and 255 deletions
gui/ivan/chatgui.html
View file @ b71b90e4
<html> <html>
<head> <head>
<title>SkyliveX 0.1.0</title> <title>SkyliveX 0.1.0</title>
<script type="text/javascript" src="SkyliveX.js"></script> <script type="text/javascript" src="SkyliveX.js"></script>
<style> <style>
body { body {
background-color: #333333; background-color: #333333;
color: #000000; color: #000000;
margin: 0 auto; margin: 0 auto;
overflow:hidden; overflow:hidden;
} }
#chatarea { p{margin: 0;}
position: absolute;
top: 26px; div.csschat {
bottom: 73px; padding: 2px;
left: 15px; word-wrap: break-word;
right: 194px; position: absolute;
background-color: #FFFFFF; top: 26px;
} bottom: 73px;
left: 15px;
#userlist { right: 194px;
position: absolute; background-color: #f2f2f2;
top: 54px; line-height: 1;
bottom: 15px; overflow:auto;
right: 18px; }
width:138px;
color: #FFFF00; div.cssuserlist {
padding-left:4px; position: absolute;
background-color: #AAAAFF; top: 54px;
} bottom: 15px;
right: 18px;
#chat1 { width:138px;
position: absolute; color: #FFFF00;
left: 0px; padding-left:4px;
top: 0px; background-color: #AAAAFF;
} line-height: 1;
overflow:auto;
#chat4 { }
position: absolute;
top: 51px; div.csschatinput {
bottom: 90px; font: medium -moz-fixed;
left: 0px; font: -webkit-small-control;
height:100%; padding: 2px;
width: 51px; word-wrap: break-word;
} position: absolute;
bottom: 11px;
#chat7 { left: 12px;
position: absolute; right: 286px;
left: 0px; height:42px;
bottom: -1px; background-color: #FFFFFF;
} line-height: 1;
overflow-y: scroll;
#chat2 { overflow-x:hidden;
position: absolute; }
top: 0px;
left: 51px; #chat1 {
right: 336px; position: absolute;
width:100%; left: 0px;
height:51px; top: 0px;
} }
#chat8 { #chat4 {
position: absolute; position: absolute;
left: 51px; top: 51px;
right: 336px; bottom: 90px;
bottom: 0px; left: 0px;
height:89px; height:100%;
width:100%; width: 51px;
} }
#chat3 { #chat7 {
position: absolute; position: absolute;
right: 178px; left: 0px;
top: 0px; bottom: -1px;
} }
#chat6 { #chat2 {
position: absolute; position: absolute;
top: 101px; top: 0px;
bottom: 90px; left: 51px;
right: 178px; right: 336px;
height:100%; width:100%;
width: 158px; height:51px;
} }
#chat9 { #chat8 {
position: absolute; position: absolute;
right: 178px; left: 51px;
bottom: -1px; right: 336px;
} bottom: 0px;
height:89px;
#ulisttop { width:100%;
position: absolute; }
right: 0px;
} #chat3 {
position: absolute;
#ulistmiddle { right: 178px;
right: 0px; top: 0px;
top: 98px; }
bottom: 84px;
height:100%; #chat6 {
width: 178px; position: absolute;
position: absolute; top: 101px;
} bottom: 90px;
right: 178px;
#ulistbottom { height:100%;
position: absolute; width: 158px;
right: 0px; }
bottom: 0px;
} #chat9 {
position: absolute;
#chatinput { right: 178px;
position: absolute; bottom: -1px;
bottom: 13px; }
left: 14px;
right: 289px; #ulisttop {
height:42px; position: absolute;
background-color: #FFFFFF; right: 0px;
} }
#ulistmiddle {
right: 0px;
top: 98px;
bottom: 84px;
height:100%;
width: 178px;
position: absolute;
}
#ulistbottom {
position: absolute;
right: 0px;
bottom: 0px;
}
</style> </style>
</head> </head>
<body> <body>
<img src="img/chat1.jpg" id="chat1"></img> <img src="img/chat1.jpg" id="chat1"></img>
<img src="img/chat4.jpg" id="chat4"></img> <img src="img/chat4.jpg" id="chat4"></img>
<img src="img/chat7.jpg" id="chat7"></img> <img src="img/chat7.jpg" id="chat7"></img>
...@@ -134,23 +149,22 @@ ...@@ -134,23 +149,22 @@
<img src="img/chat6.jpg" id="chat6"></img> <img src="img/chat6.jpg" id="chat6"></img>
<img src="img/chat9.jpg" id="chat9"></img> <img src="img/chat9.jpg" id="chat9"></img>
<img src="img/ulist_top.jpg" id="ulisttop"></img> <img src="img/ulist_top.jpg" id="ulisttop"></img>
<img src="img/ulist_mid.jpg" id="ulistmiddle"></img> <img src="img/ulist_mid.jpg" id="ulistmiddle"></img>
<img src="img/ulist_bottom.jpg" id="ulistbottom"></img> <img src="img/ulist_bottom.jpg" id="ulistbottom"></img>
<div id="chatarea"> <div id="chatarea" class="csschat">
Welcome to Skylive Chat, you are connected as Administrator! <p>Welcome to Skylive Chat, you are connected as Administrator!</p>
</div> </div>
<div id="userlist"> <div id="userlist" class="cssuserlist">
ivan_staff<br> <p>ivan_staff</p>
nextime<br> <p>nextime</p>
</div> </div>
<div id="chatinput"> <div chata id="chatinput" class="csschatinput" contenteditable >
Write the chat text here
</div> </div>
</body> </body>
</html> </html>
gui/ivan/chatgui.html.autosave 0 → 100644
View file @ b71b90e4
<html>
<head>
<title>SkyliveX 0.1.0</title>
<script type="text/javascript" src="SkyliveX.js"></script>
<style>
body {
background-color: #333333;
color: #000000;
margin: 0 auto;
overflow:hidden;
}
p{margin: 0;}
div.csschat {
padding: 2px;
word-wrap: break-word;
position: absolute;
top: 26px;
bottom: 73px;
left: 15px;
right: 194px;
background-color: #f2f2f2;
line-height: 1;
overflow:auto;
}
div.cssuserlist {
position: absolute;
top: 54px;
bottom: 15px;
right: 18px;
width:138px;
color: #FFFF00;
padding-left:4px;
background-color: #AAAAFF;
line-height: 1;
overflow:auto;
}
div.csschatinput {
font: medium -moz-fixed;
font: -webkit-small-control;
padding: 2px;
word-wrap: break-word;
position: absolute;
bottom: 11px;
left: 12px;
right: 286px;
height:42px;
background-color: #FFFFFF;
line-height: 1;
overflow-y: scroll;
overflow-x:hidden;
}
#chat1 {
position: absolute;
left: 0px;
top: 0px;
}
#chat4 {
position: absolute;
top: 51px;
bottom: 90px;
left: 0px;
height:100%;
width: 51px;
}
#chat7 {
position: absolute;
left: 0px;
bottom: -1px;
}
#chat2 {
position: absolute;
top: 0px;
left: 51px;
right: 336px;
width:100%;
height:51px;
}
#chat8 {
position: absolute;
left: 51px;
right: 336px;
bottom: 0px;
height:89px;
width:100%;
}
#chat3 {
position: absolute;
right: 178px;
top: 0px;
}
#chat6 {
position: absolute;
top: 101px;
bottom: 90px;
right: 178px;
height:100%;
width: 158px;
}
#chat9 {
position: absolute;
right: 178px;
bottom: -1px;
}
#ulisttop {
position: absolute;
right: 0px;
}
#ulistmiddle {
right: 0px;
top: 98px;
bottom: 84px;
height:100%;
width: 178px;
position: absolute;
}
#ulistbottom {
position: absolute;
right: 0px;
bottom: 0px;
}
</style>
</head>
<body>
<img src="img/chat1.jpg" id="chat1"></img>
<img src="img/chat4.jpg" id="chat4"></img>
<img src="img/chat7.jpg" id="chat7"></img>
<img src="img/chat2.jpg" id="chat2"></img>
<img src="img/chat8.jpg" id="chat8"></img>
<img src="img/chat3.jpg" id="chat3"></img>
<img src="img/chat6.jpg" id="chat6"></img>
<img src="img/chat9.jpg" id="chat9"></img>
<img src="img/ulist_top.jpg" id="ulisttop"></img>
<img src="img/ulist_mid.jpg" id="ulistmiddle"></img>
<img src="img/ulist_bottom.jpg" id="ulistbottom"></img>
<div id="chatarea" class="csschat">
<p>Welcome to Skylive Chat, you are connected as Administrator!</p>
</div>
<div id="userlist" class="cssuserlist">
<p>ivan_staff</p>
<p>nextime</p>
</div>
<div chata id="chatinput" class="csschatinput" contenteditable >
</div>
</body>
</html>
gui/ivan/img/Thumbs.db
View file @ b71b90e4
No preview for this file type
gui/ivan/maingui.html
View file @ b71b90e4
<html> <html>
<head> <head>
<title>SkyliveX 0.1.0</title> <title>SkyliveX 0.1.0</title>
<script type="text/javascript" src="SkyliveX.js"></script> <script type="text/javascript" src="SkyliveX.js"></script>
<style> <style>
body { body {
background-color: #FFFFFF; background-color: #FFFFFF;
background-image:url('img/mainbg2.jpg'); background-image:url('img/mainbg.jpg');
color: #000000; background-repeat:no-repeat;
margin: 0 auto; color: #000000;
overflow:hidden; margin: 0 auto;
} overflow:hidden;
}
#datitele{
position: absolute; #datitele{
top: 82px; position: absolute;
left: 438px; top: 82px;
height:100px; left: 438px;
width:50px; height:100px;
color: #BBBBBB; width:50px;
font-size:16px; color: #BBBBBB;
background-color: #000000; font-size:16px;
} background-color: #000000;
}
#status {
height:35px; #status {
width:350px; height:35px;
color: #FFFF00; width:350px;
text-align: left; color: #FFFF00;
font-size:12px; text-align: left;
position: absolute; font-size:12px;
top: 359px; position: absolute;
left: 38px; top: 359px;
} left: 38px;
}
#livearea {
height:240x; #livearea {
width:320px; height:240x;
top:73px; width:320px;
left: 61px; top:73px;
position: absolute; left: 61px;
} position: absolute;
}
#chatarea {
position: absolute;
top: 465px; #telescope {
left: 23px; position: absolute;
height:154px; top: 23px;
width:407px; left: 312px;
overflow-y: auto; width: auto;
background-color: #FFFFFF; color: #CCCCCC;
} font-size:18px;
background-color: #000000;
#userlist { }
position: absolute;
top: 466px; #numteleselect {
left: 470px; position: absolute;
height:220px; top: 20px;
width:140px; left: 407px;
color: #FFFF00; }
background-color: #AAAAFF;
} </style>
</head>
#chatinput { <body>
position: absolute; <div id="status">
top: 642px; Telescopio chiuso per maltempo
left: 23px;
height:50px;
width:298px;
background-color: #FFFFFF;
}
#telescope {
position: absolute;
top: 23px;
left: 312px;
width: auto;
color: #CCCCCC;
font-size:18px;
background-color: #000000;
}
#numteleselect {
position: absolute;
top: 20px;
left: 407px;
}
</style>
</head>
<body>
<div id="status">
Telescopio chiuso per maltempo
</div> </div>
<div id="datitele"> <div id="datitele">
RA<br> RA<br>
DEC<br> DEC<br>
CCD Temp.<br> CCD Temp.<br>
FWHM<br> FWHM<br>
</div> </div>
<div id="livearea"> <div id="livearea">
<img src="http://live1.skylive.name/tele1/live640.jpg"></img> <img src="http://live1.skylive.name/tele1/live640.jpg"></img>
</div> </div>
<div id="chatarea"> <div id="telescope">
Welcome to Skylive Chat, you are connected as Administrator! Telescope
</div> </div>
<div id="userlist">
ivan_staff<br>
nextime<br>
</div>
<div id="chatinput">
Write the chat text here
</div>
<div id="telescope">
Telescope
</div>
<div id="numteleselect">
<select name="numtele">
<option selected>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
</select>
</div>
</body> <div id="numteleselect">
<select name="numtele">
<option selected>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
</select>
</div>
</body>
</html> </html>
gui/nextime/maingui.html
View file @ b71b90e4
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
top: 0px; top: 0px;
right: 130px; right: 130px;
left: 0px; left: 0px;
line-height: .3 em;
} }
#chatlist { #chatlist {
overflow-y: auto; overflow-y: auto;
......
skylivex.pro.user 0 → 100644
View file @ b71b90e4
This diff is collapsed.
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