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 Show whitespace changes
Inline Side-by-side
Showing with 635 additions and 255 deletions
gui/ivan/chatgui.html
View file @ b71b90e4
...@@ -10,16 +10,22 @@ ...@@ -10,16 +10,22 @@
overflow:hidden; overflow:hidden;
} }
#chatarea { p{margin: 0;}
div.csschat {
padding: 2px;
word-wrap: break-word;
position: absolute; position: absolute;
top: 26px; top: 26px;
bottom: 73px; bottom: 73px;
left: 15px; left: 15px;
right: 194px; right: 194px;
background-color: #FFFFFF; background-color: #f2f2f2;
line-height: 1;
overflow:auto;
} }
#userlist { div.cssuserlist {
position: absolute; position: absolute;
top: 54px; top: 54px;
bottom: 15px; bottom: 15px;
...@@ -28,6 +34,24 @@ ...@@ -28,6 +34,24 @@
color: #FFFF00; color: #FFFF00;
padding-left:4px; padding-left:4px;
background-color: #AAAAFF; 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 { #chat1 {
...@@ -110,19 +134,10 @@ ...@@ -110,19 +134,10 @@
bottom: 0px; bottom: 0px;
} }
#chatinput {
position: absolute;
bottom: 13px;
left: 14px;
right: 289px;
height:42px;
background-color: #FFFFFF;
}
</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,22 +149,21 @@ ...@@ -134,22 +149,21 @@
<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
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<style> <style>
body { body {
background-color: #FFFFFF; background-color: #FFFFFF;
background-image:url('img/mainbg2.jpg'); background-image:url('img/mainbg.jpg');
background-repeat:no-repeat;
color: #000000; color: #000000;
margin: 0 auto; margin: 0 auto;
overflow:hidden; overflow:hidden;
...@@ -41,34 +42,6 @@ ...@@ -41,34 +42,6 @@
position: absolute; 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 { #telescope {
position: absolute; position: absolute;
...@@ -104,19 +77,6 @@ ...@@ -104,19 +77,6 @@
<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">
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"> <div id="telescope">
Telescope Telescope
</div> </div>
...@@ -129,9 +89,6 @@ ...@@ -129,9 +89,6 @@
<option>4</option> <option>4</option>
</select> </select>
</div> </div>
</body> </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