Index: openacs-4/packages/chat/www/resources/chat.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/resources/Attic/chat.css,v diff -u -N --- openacs-4/packages/chat/www/resources/chat.css 20 Nov 2018 17:27:59 -0000 1.17 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,221 +0,0 @@ -* { - box-sizing: border-box; -} - -/* Chat container */ -#xowiki-chat-container { - height: 70vh; - width: 100%; - position: relative; -} - -/* Users and messages container */ -#xowiki-chat { - height: 100%; - width: 100%; - margin-bottom: 1%; - overflow: hidden; - display: flex; - background-color: white; -} - -#xowiki-chat-fs { - height: 100vh; - width: 100%; - overflow: hidden; - display: flex; - background-color: white; - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1031; -} - -/* Users block */ -#xowiki-chat-users { - border: 1px solid #ddd; - border-left: none; - overflow: auto; - order: 2; - display: flex; - flex-direction: column; - min-width: 240px; -} - -#xowiki-chat-users .xowiki-chat-user-link { - text-decoration: none; -} - -#xowiki-chat-users .xowiki-chat-user-block { - padding: 18px 10px 18px 16px; - border-bottom: 1px solid #ddd; -} - -#xowiki-chat-users .xowiki-chat-user-block:hover { - background-color: rgb(235,235,235); -} - -#xowiki-chat-users .xowiki-chat-user-pic { - width: 45px; - height: 45px; - border-radius: 50%; - border: 2px solid; - padding: 3px; - margin-right: 15px; -} - -#xowiki-chat-users .xowiki-chat-user-pic-wrap { - float: left; -} - -#xowiki-chat-users .xowiki-chat-user { - font-weight: bold; -} - -#xowiki-chat-users .xowiki-chat-timestamp { - color: rgb(152,152,152); -} - -/* Messages block */ -#xowiki-chat-messages-and-form { - width: 100%; - border: 1px solid #ddd; - display: flex; - flex-direction: column; - order: 1; - justify-content: flex-end; -} - -#xowiki-chat-messages { - padding: 10px; - height: 100%; - overflow: auto; - order: 1; -} - -#xowiki-chat-messages .xowiki-chat-user-block { - float: left; -} - -#xowiki-chat-messages .xowiki-chat-user-block-me { - float: left; -} - -#xowiki-chat-messages .xowiki-chat-user { - white-space: nowrap; -} - -#xowiki-chat-messages .xowiki-chat-message { - padding: 10px; -} - -#xowiki-chat-messages .xowiki-chat-message-me { - padding: 10px; -} - -#xowiki-chat-messages .xowiki-chat-timestamp { - color: rgb(152,152,152); - float: right; -} - -#xowiki-chat-messages .xowiki-chat-timestamp-me { - /* color: yellow; */ - color: rgb(152,152,152); - float: right; - /* font-size: 65%; */ -} - -/* Send form */ -#xowiki-chat-messages-form-block { - margin-left: 20px; - margin-right: 20px; - margin-top: 5px; - border-top: 1px solid #ddd; - padding: 10px 10px 10px 10px; - min-height: 80px; - display: flex; - align-items: center; - order: 2; -} - -#xowiki-chat-messages-form { - width: 100%; - display: flex; - align-items: center; -} - -#xowiki-chat-send { - /* font-size: 24px; */ - height: 48px; - flex-grow: 2; - padding-left: 10px; - border: 0; - outline: none; - background-color: #eceff1; - border-radius: 8px; - padding-right: 45px; -} - -#xowiki-chat-send-button { - cursor: pointer; - height: 35px; - width: 35px; - border-radius: 50%; - border: 0; - margin-left: -40px; - margin-right: 15px; - background: #05728f none repeat scroll 0 0; -} - -#xowiki-chat-send-button:hover { - background: #05958f none repeat scroll 0 0; -} - -#xowiki-chat-messages-send-pic { - display: block; - margin: auto; - stroke: white; - fill: none; -} - -/* Full screen trigger */ -.xowiki-chat-trigger-fs-pic { - width: 40px; - height: 40px; - fill: #b3b3b3; -} - -.xowiki-chat-trigger-fs-pic:hover { - background-color: white; - border: 1px solid white; -} - -/* Responsive design */ -@media (max-width: 1000px) { - #xowiki-chat { - flex-direction: column; - } - #xowiki-chat-fs { - flex-direction: column; - height: 100%; - } - #xowiki-chat-users { - order: 1; - border-left: 1px solid #ddd; - border-bottom: none; - flex-direction: row; - overflow-x: auto; - } - #xowiki-chat-users .xowiki-chat-user-block { - border-right: 1px solid #ddd; - border-bottom: none; - min-width: 240px; - } - #xowiki-chat-messages-and-form { - width: 100%; - order: 2; - flex: 1 1 auto; - } -} Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v diff -u -N -r1.45 -r1.46 --- openacs-4/packages/xowiki/tcl/chat-procs.tcl 20 Nov 2018 18:41:05 -0000 1.45 +++ openacs-4/packages/xowiki/tcl/chat-procs.tcl 20 Nov 2018 18:45:56 -0000 1.46 @@ -433,15 +433,12 @@ set context id=$chat_id&s=$session_id&class=[self] set base_url ${xowiki_path}chat?${context} - # Get the static content from resources folder in the right - # package depending on chat implementation (chat or xowiki - # package). Request processor will serve the proper themed css - # when available. - set package_key [apm_package_key_from_id $package_id] - set resources_path /resources/${package_key} + # This might come in handy to get resources from the chat package + # if we want to have e.g. a separate css. + # set package_key [apm_package_key_from_id $package_id] + # set resources_path /resources/${package_key} + template::head::add_css -href /resources/xowiki/chat.css - template::head::add_css -href ${resources_path}/chat.css - if {$mode eq ""} { # # The parameter "mode" was not specified, we try to guess the