From b6704ccee41c25dcf01e9707078ba83597477305 Mon Sep 17 00:00:00 2001 From: genuineparts Date: Tue, 17 Jun 2025 21:55:44 +0200 Subject: [PATCH] More design work and bugfixes --- inc/core.class.php | 7 +- js/calendar/dhtmlgoodies_calendar.css | 227 +++++++++--------- login.php | 2 +- .../chat/templates/default/allroomlist.tpl | 12 +- .../chat/templates/default/chat_full_ws.tpl | 7 +- modules/chat/templates/default/userlist.tpl | 2 +- modules/mybbnews/mybbnews.module.php | 2 +- modules/mybbnews/mybbnews.plugins.php | 1 + themes/funchat/images/female.png | Bin 0 -> 590 bytes themes/funchat/images/male.png | Bin 0 -> 629 bytes themes/funchat/images/na.png | Bin 0 -> 203 bytes themes/funchat/images/notice_off.png | Bin 0 -> 778 bytes themes/funchat/images/notice_on.png | Bin 0 -> 718 bytes themes/funchat/images/password.png | Bin 0 -> 237 bytes themes/funchat/images/unlocked.png | Bin 0 -> 615 bytes themes/funchat/layout/styles/forms.css | 126 +++++++++- themes/funchat/layout/styles/layout.css | 1 - 17 files changed, 244 insertions(+), 143 deletions(-) create mode 100644 themes/funchat/images/female.png create mode 100644 themes/funchat/images/male.png create mode 100644 themes/funchat/images/na.png create mode 100644 themes/funchat/images/notice_off.png create mode 100644 themes/funchat/images/notice_on.png create mode 100644 themes/funchat/images/password.png create mode 100644 themes/funchat/images/unlocked.png diff --git a/inc/core.class.php b/inc/core.class.php index fb984c2..980abaa 100644 --- a/inc/core.class.php +++ b/inc/core.class.php @@ -251,7 +251,9 @@ class Core{ } $tpl->assign('messagetitle', $title); if($redirect && $url!=''){ - $url = '//'.$config['domain'].$config['path'].$url; + if(substr( $url, 0, 4 ) != "http") { + $url = '//'.$config['domain'].$config['path'].$url; + } $meta.=''; } $this->make_page($tpl->fetch('message.tpl'),$minimal); @@ -454,8 +456,7 @@ class Core{ $this->log->write('Modul '.$task.' not found!',2); return $error->http_error('404'); - - } + } $this->make_page($content); } diff --git a/js/calendar/dhtmlgoodies_calendar.css b/js/calendar/dhtmlgoodies_calendar.css index d7088c5..7446316 100644 --- a/js/calendar/dhtmlgoodies_calendar.css +++ b/js/calendar/dhtmlgoodies_calendar.css @@ -1,141 +1,140 @@ -#calendarDiv{ - position:absolute; - width:205px; - line-height: 10px; - border:1px solid #317082; - padding:1px; - background-color: #FFF; - font-family:arial; - font-size:10px; - padding-bottom:20px; - visibility:hidden; +#calendarDiv { + position: absolute; + width: 205px; + line-height: 10px; + border: 1px solid #317082; + padding: 1px; + background-color: #0a2145; + font-family: arial; + font-size: 10px; + padding-bottom: 20px; + visibility: hidden; } -#calendarDiv span,#calendarDiv img{ - float:left; +#calendarDiv span, +#calendarDiv img { + float: left; } -#calendarDiv table{ - margin: 0; +#calendarDiv table { + margin: 0; } -#calendarDiv .selectBox,#calendarDiv .selectBoxOver{ - - line-height:12px; - padding:1px; - cursor:pointer; - padding-left:2px; +#calendarDiv .selectBox, +#calendarDiv .selectBoxOver { + line-height: 12px; + padding: 1px; + cursor: pointer; + background-color: #fdac46; + padding-left: 2px; } -#calendarDiv .selectBoxTime,#calendarDiv .selectBoxTimeOver{ - line-height:12px; - padding:1px; - cursor:pointer; - padding-left:2px; +#calendarDiv .selectBoxTime, +#calendarDiv .selectBoxTimeOver { + line-height: 12px; + padding: 1px; + cursor: pointer; + padding-left: 2px; } -#calendarDiv td{ - padding:3px; - margin:0px; - font-size:10px; +#calendarDiv td { + padding: 3px; + margin: 0px; + font-size: 10px; } - - -#calendarDiv .selectBox{ - border:1px solid #E2EBED; - color: #E2EBED; - position:relative; +#calendarDiv .selectBox { + border: 1px solid #e2ebed; + color: #000; + position: relative; } -#calendarDiv .selectBoxOver{ - border:1px solid #FFF; - background-color: #317082; - color: #FFF; - position:relative; +#calendarDiv .selectBoxOver { + border: 1px solid #fff; + background-color: #fdac46; + color: #000; + position: relative; } -#calendarDiv .selectBoxTime{ - border:1px solid #317082; - color: #317082; - position:relative; +#calendarDiv .selectBoxTime { + border: 1px solid #317082; + color: #000; + position: relative; } -#calendarDiv .selectBoxTimeOver{ - border:1px solid #216072; - color: #216072; - position:relative; +#calendarDiv .selectBoxTimeOver { + border: 1px solid #216072; + color: #000; + position: relative; } -#calendarDiv .topBar{ - height:16px; - padding:2px; - background-color: #317082; - - +#calendarDiv .topBar { + height: 16px; + padding: 2px; + background-color: #fdac46; } -#calendarDiv .activeDay{ /* Active day in the calendar */ - color:#FF0000; +#calendarDiv .activeDay { + /* Active day in the calendar */ + color: #ff0000; } -#calendarDiv .todaysDate{ - height:17px; - line-height:17px; - padding:2px; - background-color: #E2EBED; - text-align:center; - position:absolute; - bottom:0px; - width:201px; +#calendarDiv .todaysDate { + height: 17px; + line-height: 17px; + padding: 2px; + color: #000; + background-color: #fdac46; + text-align: center; + position: absolute; + bottom: 0px; + width: 201px; } -#calendarDiv .todaysDate div{ - float:left; -} - -#calendarDiv .timeBar{ - height:17px; - line-height:17px; - background-color: #E2EBED; - width:72px; - color:#FFF; - position:absolute; - right:0px; +#calendarDiv .todaysDate div { + float: left; } -#calendarDiv .timeBar div{ - float:left; - margin-right:1px; +#calendarDiv .timeBar { + height: 17px; + line-height: 17px; + background-color: #e2ebed; + width: 72px; + color: #fff; + position: absolute; + right: 0px; } - -#calendarDiv .monthYearPicker{ - background-color: #E2EBED; - border:1px solid #AAAAAA; - position:absolute; - color: #317082; - left:0px; - top:15px; - z-index:1000; - display:none; - -} -#calendarDiv #monthSelect{ - width:70px; -} -#calendarDiv .monthYearPicker div{ - float:none; - clear:both; - padding:1px; - margin:1px; - cursor:pointer; -} -#calendarDiv .monthYearActive{ - background-color:#317082; - color: #E2EBED; +#calendarDiv .timeBar div { + float: left; + margin-right: 1px; } -#calendarDiv td{ - text-align:right; - cursor:pointer; +#calendarDiv .monthYearPicker { + background-color: #e2ebed; + border: 1px solid #aaaaaa; + position: absolute; + color: #317082; + left: 0px; + top: 15px; + z-index: 1000; + display: none; +} +#calendarDiv #monthSelect { + width: 70px; +} +#calendarDiv .monthYearPicker div { + float: none; + clear: both; + padding: 1px; + margin: 1px; + cursor: pointer; +} +#calendarDiv .monthYearActive { + background-color: #317082; + color: #e2ebed; } -#calendarDiv .topBar img{ - cursor:pointer; +#calendarDiv td { + text-align: right; + cursor: pointer; } -#calendarDiv .topBar div{ - float:left; - margin-right:1px; + +#calendarDiv .topBar img { + cursor: pointer; +} +#calendarDiv .topBar div { + float: left; + margin-right: 1px; } diff --git a/login.php b/login.php index bd98926..447d85f 100644 --- a/login.php +++ b/login.php @@ -73,6 +73,6 @@ if($_POST['username']!='' && $_POST['password']!=''){ }else{ $tpl->assign('config',$config); $content=$tpl->fetch('login.tpl'); - $core->make_page($content, true); + $core->make_page($content, FALSE); } ?> diff --git a/modules/chat/templates/default/allroomlist.tpl b/modules/chat/templates/default/allroomlist.tpl index 5fcdabb..5c513dc 100644 --- a/modules/chat/templates/default/allroomlist.tpl +++ b/modules/chat/templates/default/allroomlist.tpl @@ -1,4 +1,5 @@ -

Raumliste

(schließen)
+

Raumliste

(schließen) +
{if $users==""}

No users. @@ -7,19 +8,20 @@ No users.

{foreach from=$users key=key item=user} {if $user.s == false} - {$key}
+ {$key}
{else} - {$key}
+ {$key}
{/if} {foreach from=$user.u item=i} - {$i.l}{$i.n} 
+ {$i.l}{$i.n} 
{/foreach} {/foreach} {/if}
+
{if $js!=""} -{/if} \ No newline at end of file +{/if} diff --git a/modules/chat/templates/default/chat_full_ws.tpl b/modules/chat/templates/default/chat_full_ws.tpl index 72b29df..9c75ee7 100644 --- a/modules/chat/templates/default/chat_full_ws.tpl +++ b/modules/chat/templates/default/chat_full_ws.tpl @@ -1,7 +1,7 @@ {$header}
-
+ @@ -13,12 +13,11 @@ {$rightnav}

+

-
- -
+