Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates.
This commit is contained in:
parent
9398e49eb7
commit
1c0fe89368
@ -6,18 +6,19 @@
|
|||||||
#chatTopBar {
|
#chatTopBar {
|
||||||
float: left;
|
float: left;
|
||||||
height: 400px;
|
height: 400px;
|
||||||
width: 400px;
|
width: 77%;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
#chatSide {
|
#chatSide {
|
||||||
float: right;
|
float: right;
|
||||||
width: 150px;
|
width: 20%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
#chatDrop {
|
#chatDrop {
|
||||||
margin-bottom: 20px;
|
margin: 20px 0;
|
||||||
|
float: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
#chatUsers {
|
#chatUsers {
|
||||||
@ -31,6 +32,14 @@
|
|||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#chatOptionsBar {
|
||||||
|
margin-top: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#chatText {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
section {
|
section {
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
}
|
}
|
||||||
@ -60,3 +69,5 @@
|
|||||||
padding: 3px;
|
padding: 3px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
|
|
||||||
#side-follow-url {
|
#side-follow-url {
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
#side-follow-submit {
|
#side-follow-submit {
|
||||||
|
@ -337,7 +337,7 @@ input {
|
|||||||
background-color: #FFF;
|
background-color: #FFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit {
|
.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit {
|
||||||
background-color: #FFF;
|
background-color: #FFF;
|
||||||
color: #43488A;
|
color: #43488A;
|
||||||
border-radius: 0px;
|
border-radius: 0px;
|
||||||
@ -346,7 +346,7 @@ input {
|
|||||||
transition: all .3s ease-in-out;
|
transition: all .3s ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover {
|
.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus {
|
||||||
border-color: #FFF;
|
border-color: #FFF;
|
||||||
background-color: #43488A;
|
background-color: #43488A;
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
|
@ -307,6 +307,11 @@ pre {
|
|||||||
border-color: #222;
|
border-color: #222;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pmenu-item:hover a {
|
||||||
|
background-color: #333 !important;
|
||||||
|
color: #ddd;
|
||||||
|
}
|
||||||
|
|
||||||
.preview {
|
.preview {
|
||||||
background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
|
background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,5 @@
|
|||||||
<div class="generic-content-wrapper-styled">
|
<div class="generic-content-wrapper-styled">
|
||||||
<h1>{{$room_name}}</h1>
|
|
||||||
<div id="chatContainer">
|
|
||||||
|
|
||||||
<div id="chatTopBar">
|
|
||||||
<div id="chatLineHolder"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="chatSide">
|
|
||||||
{{if $is_owner}}
|
{{if $is_owner}}
|
||||||
<div id="chatDrop">
|
<div id="chatDrop">
|
||||||
<form id="chat-destroy" method="post" action="chat">
|
<form id="chat-destroy" method="post" action="chat">
|
||||||
@ -14,9 +7,20 @@
|
|||||||
<input type="hidden" name="action" value="drop" />
|
<input type="hidden" name="action" value="drop" />
|
||||||
<input type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"/>
|
<input type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"/>
|
||||||
</form>
|
</form>
|
||||||
</div><br />
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
<h1>{{$room_name}}</h1>
|
||||||
|
|
||||||
|
|
||||||
|
<div id="chatContainer">
|
||||||
|
|
||||||
|
<div id="chatTopBar">
|
||||||
|
<div id="chatLineHolder"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="chatSide">
|
||||||
|
|
||||||
<div id="chatUsers"></div><br />
|
<div id="chatUsers"></div><br />
|
||||||
</div>
|
</div>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
@ -25,14 +29,14 @@
|
|||||||
|
|
||||||
<form id="chat-form" method="post" action="#">
|
<form id="chat-form" method="post" action="#">
|
||||||
<input type="hidden" name="room_id" value="{{$room_id}}" />
|
<input type="hidden" name="room_id" value="{{$room_id}}" />
|
||||||
<textarea id="chatText" name="chat_text" rows=3 cols=80></textarea><br />
|
<textarea id="chatText" name="chat_text" rows=3></textarea><br />
|
||||||
<input type="submit" name="submit" value="{{$submit}}" />
|
<input type="submit" name="submit" value="{{$submit}}" />
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}}
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
<div id="chatOptionsBar">
|
||||||
|
<a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<h3>{{$connect}}</h3>
|
<h3>{{$connect}}</h3>
|
||||||
<div id="connect-desc">{{$desc}}</div>
|
<div id="connect-desc">{{$desc}}</div>
|
||||||
<form action="follow" method="post" />
|
<form action="follow" method="post" />
|
||||||
<input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" />
|
<input id="side-follow-url" type="text" name="url" title="{{$hint}}" />
|
||||||
<input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" />
|
<input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" />
|
||||||
</form>
|
</form>
|
||||||
{{if $abook_usage_message}}
|
{{if $abook_usage_message}}
|
||||||
|
Reference in New Issue
Block a user