diff --git a/src/messenger/webim/default.css b/src/messenger/webim/default.css new file mode 100644 index 00000000..3f265cf9 --- /dev/null +++ b/src/messenger/webim/default.css @@ -0,0 +1,437 @@ +/* + This file is part of Web Instant Messenger project. + + Copyright (c) 2005-2009 Web Messenger Community + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + +*/ + +/* reset all */ + +html, body, div, h1, h2, h3, h4, h5, h6, ul, ol, dl, li, dt, dd, p, blockquote, pre, form, fieldset, table, th, td { margin: 0; padding: 0; } +table { border-collapse:collapse; border-spacing:0; } +fieldset,img { border:0; } +ol,ul { list-style:none; } +h1,h2,h3,h4,h5,h6 { font-size:100%; font-weight:normal; } +q:before,q:after { content:''; } + +body { + background: #FFFFFF url(images/header.gif) repeat-x; + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size: 0.8em; + line-height: 140%; + color: #333333; +} + +/* 100% height with footer, 200 px sidebar */ + +html, body { + height: 100%; +} + +body { + min-width: 700px; +} + +a { + color: #2f7599; +} + +#wrap { + position:relative; + width: 100%; + margin: 0px auto -41px; + height:auto !important; + height:100%; + min-height:100%; + min-width:700px; +} + +.contentdiv { + float:left; + width: 100%; +} + +.contentinner { + margin-right: 210px; + padding: 10px 60px 10px 20px; +} + +.empty_inner { + height:40px; +} + +#footer { + background: white url(images/footer.gif) bottom repeat-x; + font-size:11px; + position:relative; + + min-height: 40px; + height:40px; + vertical-align:middle; + + width:100%; + text-align: center; +} + +#legal { + clear: both; + line-height: 30px; + padding-top:10px; + text-align: center; + color: #375C69; + margin-bottom: 0px; +} + +#footer .flink { + color: #2f7599; + text-decoration: underline; +} + +/* Header */ + +#header { + width: 100%; + height: 32px; + margin: 0px auto 10px auto; + padding-top: 10px; + padding-bottom: 5px; + background: url(images/graydot.gif) repeat-x left bottom; + display: block; +} + +#header { + float: left; +} + +img.left { + float: left; + margin-right: 15px; +} + +#header h1 { + font-size: 2em; + line-height: 32px; + color: #494949; + margin-left: 40px; +} + +#header h1 a { + color: #494949; +} + +#header a { + text-decoration: none; +} + +#title { + float: left; + display: inline; +} + +#path { + float: right; + padding: 10px 20px 0px 0px; + line-height: 22px; + display: inline; +} + +/* Sidebar */ + +#sidebar { + float: left; + width: 185px; + margin-left: -210px; + margin-top: 20px; + position:relative; + line-height: 180% +} + +#sidebar ul { + margin: 0; + padding: 0; + list-style: none; +} + +#sidebar li { + margin-bottom: 20px; +} + +#sidebar li ul { +} + +#sidebar li li { + margin: 0; +} + +#sidebar h2 { + text-transform: lowercase; + margin-bottom: 10px; + background: url(images/graydot.gif) repeat-x left bottom; + font-size: 1.3em; +} + +.locales a { + color: #2f7599; + font-size: 1em; + text-decoration: none; +} + +.locales .active a { + color: #555; +} + +.locales a:hover { + text-decoration: underline; +} + +.submenu a { + padding-left: 15px; + color: #2f7599; + font-size: 1em; + text-decoration: none; +} + +.submenu .active a { + background: url(images/li.gif) no-repeat left 1px; + color: #555; +} + +.submenu a:hover { + text-decoration: underline; +} + +/* form, tabbed form */ + +.mform { + background: url(images/loginbg.gif); + clear: both; +} + +.tabs { + float: right; + display: inline; + margin-right: 15px; +} + +.tabs li { + display: inline; +} + +.tabs a { + display: block; + float: left; + padding: 2px 9px 3px 9px; + font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size: 11px; + color: #2f7599; +} + +.tabs li.active a { + background: url(images/loginbg.gif); + border-left:1px solid #bbbbbb;border-top:1px solid #bbbbbb;border-right:1px solid #bbbbbb; + color: #000; + text-decoration: none; +} + +.formtop, .formbottom, .formtopi, .formbottomi { height: 15px;} +.formtop { background: url(images/logincrnrt.gif) no-repeat top right;} +.formtopi { background: url(images/logincrnlt.gif) no-repeat top left; } +.formbottom { background: url(images/logincrnrb.gif) no-repeat bottom right; } +.formbottomi { background: url(images/logincrnlb.gif) no-repeat bottom left; } +.forminner { margin: 0px 15px;} +.forminner p { margin-bottom: 1em; } + +/* fieldForm */ + +.fieldForm { + font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size: 11px; + width: 100%; +} + +div.errinfo { + color: #c13030; +} + +.field { + width: 100%; + margin-top: 5px; +} + +.flabel { + position: relative; + margin: 8px auto 2px; + color: black; +} + +.fleftlabel { + float: left; + width: 100px; +} + +.flabel span.required { + font-size:8.0pt; + color:red; + font-weight: bold; +} + +.fvalue { + float: left; +} + +.fvaluewithta { + float: left; + width: 67%; +} + +.fvaluewithta textarea { + width: 100%; +} + +.fvaluenodesc { +} + +.fvalueframe { + overflow: auto; + width: 100%; +} + +.fvalueframe iframe { + border: solid 1px #999; +} + +.fdescr { + float:left; + padding-left:10px; + color: #676767; + font-size: 10px; + min-width: 200px; +} + +.fbutton { + background: url(images/formline.gif) repeat-x; + margin-top: 20px; + padding-top: 10px; +} + +.formauth { +} + +input.formauth { + border: 1px solid #878787; + color: #333; + margin-right:15px; + padding-right: 0px; +} + +#formmessage { + border: 1px solid #4C96D4; + background-color: #E7F1F9; + padding: 8px 11px; + font-size: 11px; + font-weight:bold; + width : 400px; + margin: 0px 2px 10px; + color: #515151; +} + +.asterisk { + padding: 10px 20px; +} + +/* tables */ + +.tabletool { + float: right; +} + +.tabletool a { + color: #296685; + vertical-align: top; + padding-left: 4px; +} + +table.list { + font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif; + background: #fff; + width: 100%; + border-collapse: collapse; + text-align: left; +} + +table.list th { + font-size: 1.2em; + font-weight: normal; + color: #1D485E; + padding: 10px 8px; + border-bottom: 2px solid #2F7598; +} + +table.list td { + color: #2f7599; + padding: 10px 8px; + border-bottom: 1px solid #ccc; +} + +table.list td a.man { + background: url(images/tbliclogin.gif) no-repeat left center; + padding-left: 15px; +} + +table.list tbody tr:hover td, table.list tbody tr:hover td a { + color: #1D485E; +} + +/* search */ + +#searchtext { + float:left; + display: inline; + margin:7px 20px 5px 0px; + width:75%; + padding-right:5px; +} + +#searchtext input { + width: 100%; + margin: 0px; +} + +#searchbutton { + float:left; +} + +/* login */ + +#loginpane { + width: 350px; +} + +/* dashboard */ + +.dashitem { + width: 200px; + height: 7em; + margin: 0px 2em 2em 0px; + padding: 5px 5px; + float: left; +} + +.dashitem a { + background: url(images/graydot.gif) repeat-x left bottom; + padding-bottom: 10px; + margin-bottom: 10px; + display: block; +} + +/* install */ + +#install li { + list-style-type: circle; + list-style-position: inside; + margin-left: 2em; +} diff --git a/src/messenger/webim/images/footer.gif b/src/messenger/webim/images/footer.gif new file mode 100644 index 00000000..ba2b1a33 Binary files /dev/null and b/src/messenger/webim/images/footer.gif differ diff --git a/src/messenger/webim/images/graydot.gif b/src/messenger/webim/images/graydot.gif new file mode 100644 index 00000000..51c0ef82 Binary files /dev/null and b/src/messenger/webim/images/graydot.gif differ diff --git a/src/messenger/webim/images/header.gif b/src/messenger/webim/images/header.gif new file mode 100644 index 00000000..43c4bfe5 Binary files /dev/null and b/src/messenger/webim/images/header.gif differ diff --git a/src/messenger/webim/images/li.gif b/src/messenger/webim/images/li.gif new file mode 100644 index 00000000..29e03266 Binary files /dev/null and b/src/messenger/webim/images/li.gif differ diff --git a/src/messenger/webim/images/logo.gif b/src/messenger/webim/images/logo.gif new file mode 100644 index 00000000..d904da6e Binary files /dev/null and b/src/messenger/webim/images/logo.gif differ diff --git a/src/messenger/webim/install/dbinfo.php b/src/messenger/webim/install/dbinfo.php index f50433d2..f60ce81a 100644 --- a/src/messenger/webim/install/dbinfo.php +++ b/src/messenger/webim/install/dbinfo.php @@ -110,7 +110,7 @@ function show_install_err($text) { ); $errors = array($text); start_html_output(); - require('view_installerr.php'); + require('../view/install_err.php'); exit; } diff --git a/src/messenger/webim/install/index.php b/src/messenger/webim/install/index.php index 21bdfed5..7571215d 100644 --- a/src/messenger/webim/install/index.php +++ b/src/messenger/webim/install/index.php @@ -150,5 +150,5 @@ function check_status() { check_status(); start_html_output(); -require('view_index.php'); +require('../view/install_index.php'); ?> \ No newline at end of file diff --git a/src/messenger/webim/install/view_index.php b/src/messenger/webim/install/view_index.php deleted file mode 100644 index d43a0db4..00000000 --- a/src/messenger/webim/install/view_index.php +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - <?php echo getlocal("install.title") ?> - <?php echo getlocal("app.title") ?> - - -"> -"> - - - - - - - - -
- -

- - - -
-
- 0 ) { ?> - - - - - - -
- 0 ) { - print getlocal("errors.header"); - foreach( $errors as $e ) { - print getlocal("errors.prefix"); - print $e; - print getlocal("errors.suffix"); - } - print getlocal("errors.footer"); - } ?> - -
- - - -
- - - -
- -
    - -
    • - -
-
- -
    -
  • -

    - -
    • -
-
- - - - - - - - - - - - -
- -«Open Web Messenger» • • - -
- - - - diff --git a/src/messenger/webim/install/view_installerr.php b/src/messenger/webim/install/view_installerr.php deleted file mode 100644 index 0a81c122..00000000 --- a/src/messenger/webim/install/view_installerr.php +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - <?php echo getlocal("install.err.title") ?> - <?php echo getlocal("app.title") ?> - - -"> -"> - - - - - - - - -
- -

- - - 0 ) { ?> - - - - - - -
- 0 ) { - print getlocal("errors.header"); - foreach( $errors as $e ) { - print getlocal("errors.prefix"); - print $e; - print getlocal("errors.suffix"); - } - print getlocal("errors.footer"); - } ?> - -
- - -
- - - - - - - - - - - - -
- -«Open Web Messenger» • • - -
- - - - diff --git a/src/messenger/webim/install/whatsnew.txt b/src/messenger/webim/install/whatsnew.txt index cccecb1e..51e9cee7 100644 --- a/src/messenger/webim/install/whatsnew.txt +++ b/src/messenger/webim/install/whatsnew.txt @@ -1,3 +1,8 @@ + 1.6.0 + ----- + [+] main page: warning if database is outdated (after install) + [+] "Updates" tab in settings + 1.5.2 ----- [+] Ability to disable sound notifications for chat (toolbar button) diff --git a/src/messenger/webim/js/ie.js b/src/messenger/webim/js/ie.js new file mode 100644 index 00000000..d3d48682 --- /dev/null +++ b/src/messenger/webim/js/ie.js @@ -0,0 +1,8 @@ +window.attachEvent('onload', mkwidth); +window.attachEvent('onresize', mkwidth); + +var minwidth = 700; + +function mkwidth(){ + document.getElementById("wrap").style.width = document.documentElement.clientWidth < minwidth ? minwidth+"px" : "100%"; +}; \ No newline at end of file diff --git a/src/messenger/webim/libs/common.php b/src/messenger/webim/libs/common.php index d0d3426e..ceda8311 100644 --- a/src/messenger/webim/libs/common.php +++ b/src/messenger/webim/libs/common.php @@ -82,6 +82,7 @@ function get_available_locales() { } closedir($handle); } + sort($list); return $list; } @@ -135,15 +136,13 @@ $output_encoding = array(); function get_locale_links($href) { global $current_locale; - $localeLinks = ""; + $localeLinks = array(); $allLocales = get_available_locales(); + if(count($allLocales) < 2) { + return null; + } foreach($allLocales as $k) { - if( strlen($localeLinks) > 0 ) - $localeLinks .= " • "; - if( $k == $current_locale ) - $localeLinks .= getlocal_($k, "names"); - else - $localeLinks .= "".getlocal_($k, "names").""; + $localeLinks[$k] = getlocal_($k, "names"); } return $localeLinks; } @@ -345,13 +344,13 @@ function wrong_field($key) { function get_popup($href,$jshref,$message,$title,$wndName,$options) { if(!$jshref) { $jshref = "'$href'"; } - return "$message"; + return "$message"; } function get_image($href,$width,$height) { if( $width != 0 && $height != 0 ) - return ""; - return ""; + return "\"\"/"; + return "\"\"/"; } function get_gifimage_size($filename) { diff --git a/src/messenger/webim/libs/pagination.php b/src/messenger/webim/libs/pagination.php index 3212bd3c..01f216e5 100644 --- a/src/messenger/webim/libs/pagination.php +++ b/src/messenger/webim/libs/pagination.php @@ -19,12 +19,12 @@ function generate_pagination_link($page,$title) { $lnk = $_SERVER['REQUEST_URI']; $href = preg_replace("/\?page=\d+\&/", "?", preg_replace("/\&page=\d+/", "", $lnk)); $href .= strstr($href,"?") ? "&page=$page" : "?page=$page"; - return "$title"; + return "$title"; } -function generate_pagination_image($id) { +function generate_pagination_image($id,$alt) { global $webimroot; - return ""; + return "\"".htmlspecialchars($alt)."\"/"; } function setup_pagination($items,$default_items_per_page=15) { @@ -79,7 +79,7 @@ function generate_pagination($pagination,$bottom=true) { $maxPage = min( $curr_page + $links_on_page, $pagination['total'] ); if( $curr_page > 1 ) { - $result .= generate_pagination_link($curr_page-1, generate_pagination_image("prevpage")).$pagination_spacing; + $result .= generate_pagination_link($curr_page-1, generate_pagination_image("prevpage", "previous")).$pagination_spacing; } for($i = $minPage; $i <= $maxPage; $i++ ) { @@ -93,7 +93,7 @@ function generate_pagination($pagination,$bottom=true) { } if( $curr_page < $pagination['total'] ) { - $result .= $pagination_spacing.generate_pagination_link($curr_page+1, generate_pagination_image("nextpage")); + $result .= $pagination_spacing.generate_pagination_link($curr_page+1, generate_pagination_image("nextpage", "next")); } $result.=""; } diff --git a/src/messenger/webim/locales/de/properties b/src/messenger/webim/locales/de/properties index 19f8e295..eda3689d 100644 --- a/src/messenger/webim/locales/de/properties +++ b/src/messenger/webim/locales/de/properties @@ -80,8 +80,8 @@ demo.chat.welcome=Hallo, wie kann ich ihnen helfen ? errors.failed.uploading.file=Fehler beim Datei Upload "{0}": "{1}". errors.file.move.error=Fehler beim verschieben der Datei errors.file.size.exceeded=max. Upload Größe überschritten. -errors.footer= -errors.header=Fehler korrigieren:
+errors.header=Fehler korrigieren: