Skip to content

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

Testing merge with ivan

parent d7cb61d5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 456 deletions
gui/maingui.html deleted 100644 → 0
View file @ d7cb61d5
<html>
<head>
<title>SkyliveX 0.1.0</title>
<script type="text/javascript" src="SkyliveX.js"></script>
<style>
body {
background-color: #FFFFFF;
background-image:url('img/mainbg2.jpg');
color: #000000;
margin: 0 auto;
overflow:hidden;
}
#datitele{
position: absolute;
top: 82px;
left: 438px;
height:100px;
width:50px;
color: #BBBBBB;
font-size:16px;
background-color: #000000;
}
#status {
height:35px;
width:350px;
color: #FFFF00;
text-align: left;
font-size:12px;
position: absolute;
top: 359px;
left: 38px;
}
#livearea {
height:240x;
width:320px;
top:73px;
left: 61px;
position: absolute;
}
#chatarea {
position: absolute;
top: 465px;
left: 23px;
height:154px;
width:407px;
overflow-y: auto;
background-color: #FFFFFF;
}
#userlist {
position: absolute;
top: 466px;
left: 470px;
height:220px;
width:140px;
color: #FFFF00;
background-color: #AAAAFF;
}
#chatinput {
position: absolute;
top: 642px;
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>
<<<<<<< HEAD
<body>
<div id="page">
<div id="top">
</div>
<div id="left">
<div id="livearea">
<img src="http://live1.skylive.name/tele1/live640.jpg"></img>
</div>
<div id="toolsarea">
TOOL
</div>
</div>
<div id="right">
<div id="chatarea">
</div>
<div id="chatlist">
<p>user1</p>
<p>user2</p>
</div>
<div id="chatinput">
<p>INPUT</p>
</div>
</div>
</div>
=======
<body>
<div id="status">
Telescopio chiuso per maltempo
</div>
<div id="datitele">
RA<br>
DEC<br>
CCD Temp.<br>
FWHM<br>
</div>
<div id="livearea">
<img src="http://live1.skylive.name/tele1/live640.jpg"></img>
</div>
<div id="chatarea">
Welcome to Skylive Chat, you are connected as Administrator!
</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>
>>>>>>> SkyliveX-Ivan
</body>
</html>
skylivex.pro.user deleted 100644 → 0
View file @ d7cb61d5
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