diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_cal.css | 51 | ||||
| -rw-r--r-- | view/css/mod_chat.css | 9 | ||||
| -rw-r--r-- | view/css/mod_events.css | 13 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 16 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 6 | ||||
| -rw-r--r-- | view/tpl/chat.tpl | 29 | ||||
| -rw-r--r-- | view/tpl/chatrooms.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/events-js.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/events_cal-js.tpl | 2 |
9 files changed, 100 insertions, 34 deletions
diff --git a/view/css/mod_cal.css b/view/css/mod_cal.css new file mode 100644 index 000000000..f0b5c0166 --- /dev/null +++ b/view/css/mod_cal.css @@ -0,0 +1,51 @@ +/* fix borders */ + +.fc th:first-child, +.fc td:first-child { + border-left-width: 0px; +} + +.fc th:last-child, +.fc td:last-child { + border-right-width: 0px; + border-bottom-width: 0px; +} + +.fc-unthemed th, +.fc-unthemed td, +.fc-unthemed thead, +.fc-unthemed tbody, +.fc-unthemed .fc-divider, +.fc-unthemed .fc-row, +.fc-unthemed .fc-popover { + border-color: #ccc !important; +} + +#events-spinner .spinner { + margin-top: 9px; + margin-bottom: -9px; +} + +.bootstrap-tagsinput { + width: 100%; + padding: 6px 12px; +} + +.event-wrapper, +.vevent { + max-width: 700px; +} + +.event-owner { + padding: 10px; +} + +.event-owner img { + margin-right: 5px; +} + +.vevent, +.event-buttons { + padding: 10px; +} + diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css index 830cc2f06..57aecd557 100644 --- a/view/css/mod_chat.css +++ b/view/css/mod_chat.css @@ -11,8 +11,13 @@ padding: 7px 3px 7px 10px; } -#chatrooms-index th:nth-child(3), -#chatrooms-index td:nth-child(3){ +#chatrooms-index th:nth-child(2), +#chatrooms-index td:nth-child(2){ + text-align: right; +} + +#chatrooms-index th:nth-child(4), +#chatrooms-index td:nth-child(4){ padding: 7px 10px 7px 7px; } diff --git a/view/css/mod_events.css b/view/css/mod_events.css index e72464539..f0b5c0166 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -1,7 +1,14 @@ /* fix borders */ -#events-calendar { - margin-left: -1px; - margin-bottom: -1px; + +.fc th:first-child, +.fc td:first-child { + border-left-width: 0px; +} + +.fc th:last-child, +.fc td:last-child { + border-right-width: 0px; + border-bottom-width: 0px; } .fc-unthemed th, diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9dcfcdf3e..903900e7f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1518,21 +1518,27 @@ nav .dropdown-menu { word-wrap: break-word; } -.generic-content-wrapper.fullscreen { - position: absolute; +main.fullscreen { + left: 0px; width: 100%; height: 100%; + max-width: none; +} + +main.fullscreen .generic-content-wrapper { + position: absolute; + width: 100%; top: 0px; left: 0px; - border: 0px; border-radius: 0px; } -.generic-content-wrapper.fullscreen .section-title-wrapper { +main.fullscreen .section-title-wrapper { border-radius: 0px; } -.generic-content-wrapper.fullscreen .section-content-wrapper { +main.fullscreen .section-content-wrapper, +main.fullscreen .section-content-wrapper-np { border-radius: 0px; } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 73628ebd9..877bcd840 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -55,15 +55,13 @@ $(document).ready(function() { function makeFullScreen(full) { if(typeof full=='undefined' || full == true) { - $('main').css({'transition': 'none', 'left': '0px', 'width': '100%', 'max-width': 'none'}); - $('.generic-content-wrapper').addClass('fullscreen'); + $('main').css({'transition': 'none'}).addClass('fullscreen'); $('#fullscreen-btn, header, nav, aside').css({'display': 'none'}); $('#inline-btn').show(); } else { - $('main').css({'left': '', 'width': '', 'max-width': ''}); - $('.generic-content-wrapper').removeClass('fullscreen'); + $('main').removeClass('fullscreen'); $('#fullscreen-btn, header, nav, aside').css({'display': ''}); $('#inline-btn').hide(); $('main').css({'transition': ''}); diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index eb219f128..9cf5968cb 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -18,21 +18,16 @@ <div id="chatTopBar"> <div id="chatLineHolder"></div> </div> - - <div class="clear"></div> - <div id="chatBottomBar" > - <div class="tip"></div> <form id="chat-form" method="post" action="#"> <input type="hidden" name="room_id" value="{{$room_id}}" /> - <textarea id="chatText" name="chat_text" class="form-control"></textarea> <div class="form-group"> - + <textarea id="chatText" name="chat_text" class="form-control"></textarea> </div> <div id="chat-submit-wrapper"> <div id="chat-submit" class="dropup pull-right"> - <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="icon-caret-down"></i></button> + <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="icon-caret-up"></i></button> <button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button> <ul class="dropdown-menu"> <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="icon-circle online"></i> {{$online}}</a></li> @@ -65,29 +60,27 @@ <div class="btn-group hidden-xs"> <button id="chat-link-wrapper" class="btn btn-default btn-sm" onclick="chatJotGetLink(); return false;" > <i id="chat-link" class="icon-link jot-icons" title="{{$insert}}" ></i> - </button--> + </button> </div> {{if $feature_encrypt}} - <div class="btn-group hidden-sm hidden-xs"> + <div class="btn-group hidden-xs"> <button id="chat-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}', '#chatText', $('#chatText').val()); return false;"> <i id="chat-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i> </button> </div> {{/if}} - <div class="btn-group visible-xs visible-sm"> + <div class="btn-group dropup visible-xs"> <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> - <i id="more-tools-icon" class="icon-caret-down jot-icons"></i> + <i id="more-tools-icon" class="icon-caret-up jot-icons"></i> </button> <ul class="dropdown-menu dropdown-menu-right" role="menu"> <li class="visible-xs"><a href="#" onclick="chatJotGetLink(); return false;" ><i class="icon-link"></i> {{$insert}}</a></li> {{if $feature_encrypt}} - <li class="divider visible-xs"></li> - <li class="visible-sm visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="icon-key"></i> {{$encrypt}}</a></li> + <li class="divider"></li> + <li class="visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}', '#chatText' ,$('#chatText').val()); return false;"><i class="icon-key"></i> {{$encrypt}}</a></li> {{/if}} </ul> </div> - - </div> <div id="chat-rotator-wrapper" class="pull-left"> <div id="chat-rotator"></div> @@ -113,7 +106,7 @@ $(document).ready(function() { }); $(window).resize(function () { - if($('.generic-content-wrapper').hasClass('fullscreen')) { + if($('main').hasClass('fullscreen')) { adjustFullscreenTopBarHeight(); } else { @@ -165,11 +158,11 @@ function update_chats(chats) { if(item.self) { newNode.setAttribute('class', 'chat-item-self clear'); - $(newNode).html('<div class="chat-body-self"><div class="chat-item-title-self"><span class="chat-item-name-self">' + item.name + ' </span><span class="autotime chat-item-time-self" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text-self">' + item.text + '</div></div><img class="chat-item-photo-self" src="' + item.img + '" alt="' + item.name + '" />'); + $(newNode).html('<div class="chat-body-self"><div class="chat-item-title-self wall-item-ago"><span class="chat-item-name-self">' + item.name + ' </span><span class="autotime chat-item-time-self" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text-self">' + item.text + '</div></div><img class="chat-item-photo-self" src="' + item.img + '" alt="' + item.name + '" />'); } else { newNode.setAttribute('class', 'chat-item clear'); - $(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><div class="chat-item-title"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text">' + item.text + '</div></div>'); + $(newNode).html('<img class="chat-item-photo" src="' + item.img + '" alt="' + item.name + '" /><div class="chat-body"><div class="chat-item-title wall-item-ago"><span class="chat-item-name">' + item.name + ' </span><span class="autotime chat-item-time" title="' + item.isotime + '">' + item.localtime + '</span></div><div class="chat-item-text">' + item.text + '</div></div>'); } $('#chatLineHolder').append(newNode); $(".autotime").timeago(); diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index e3d0eb5b5..de8cdce7c 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -12,14 +12,16 @@ <div class="section-content-wrapper-np"> <table id="chatrooms-index"> <tr> - <th width="98%">{{$name}}</th> + <th width="97%">{{$name}}</th> + <th width="1%">{{$expire}}</th> <th width="1%" class="chatrooms-index-tool"></th> <th width="1%"></th> </tr> {{foreach $rooms as $room}} <tr class="chatroom-index-row"> <td><a href="{{$baseurl}}/chat/{{$nickname}}/{{$room.cr_id}}">{{$room.cr_name}}</a></td> - <td class="chatrooms-index-tool dropdown"> + <td>{{$room.cr_expire}} min</td> + <td class="chatrooms-index-tool dropdown pull-right"> {{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i> <ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul> diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index c29d80347..5c9eb2814 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,6 +1,8 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> + <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button> + <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button> <button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button> <div class="btn-group"> <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button> diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl index bc8a3aa31..abffb2a92 100755 --- a/view/tpl/events_cal-js.tpl +++ b/view/tpl/events_cal-js.tpl @@ -2,6 +2,8 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> + <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button> + <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button> <div class="btn-group"> <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button> <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button> |