diff --git a/src/messenger/webim/default.css b/src/messenger/webim/default.css index 0fb5ea1d..e66a6705 100644 --- a/src/messenger/webim/default.css +++ b/src/messenger/webim/default.css @@ -227,6 +227,7 @@ img.left { .mform { background: url(images/loginbg.gif); clear: both; + width: 100%; } .tabs { @@ -271,6 +272,14 @@ img.left { width: 100%; } +.packedFormField { + font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; + font-size: 11px; + float:left; + margin-right:25px; + margin-bottom:8px; +} + div.errinfo { color: #c13030; } @@ -339,6 +348,12 @@ div.errinfo { .formauth { } +textarea.wide { + border:1px solid #878787; + overflow:auto; + width: 95%; +} + input.formauth { border: 1px solid #878787; color: #333; @@ -373,7 +388,7 @@ input.formauth { padding-left: 4px; } -table.list { +table.list, table.translate { font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif; background: #fff; width: 100%; @@ -381,7 +396,7 @@ table.list { text-align: left; } -table.list th { +table.list th, table.translate th { font-size: 1.2em; font-weight: normal; color: #1D485E; @@ -395,6 +410,14 @@ table.list td { border-bottom: 1px solid #ccc; } +table.translate td { + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + color: #515151; + padding: 2px 8px; + border-bottom: 1px solid #ccc; +} + table.list td a.man { background: url(images/tbliclogin.gif) no-repeat left center; padding-left: 15px; diff --git a/src/messenger/webim/locales/en/properties b/src/messenger/webim/locales/en/properties index d30c2f2f..68925be7 100644 --- a/src/messenger/webim/locales/en/properties +++ b/src/messenger/webim/locales/en/properties @@ -172,6 +172,7 @@ menu.locale=Language menu.locale.content=Change locale. menu.main=Main menu.operator=You are {0} +menu.translate=Localize my_settings.error.password_match=Entered passwords do not match no_such_operator=No such operator page.analysis.search.head_host=Visitor's address diff --git a/src/messenger/webim/locales/ru/properties b/src/messenger/webim/locales/ru/properties index 251b4cbf..3f0db2ca 100644 --- a/src/messenger/webim/locales/ru/properties +++ b/src/messenger/webim/locales/ru/properties @@ -171,6 +171,7 @@ menu.locale= menu.locale.content=Сменить язык. menu.main=Главная menu.operator=Вы {0} +menu.translate=Локализация my_settings.error.password_match=Введенные пароли должны совпадать no_such_operator=Запрашиваемая учетная запись не существует page.analysis.search.head_host=Адрес посетителя diff --git a/src/messenger/webim/operator/translate.php b/src/messenger/webim/operator/translate.php index 69724a37..98cdbf3e 100644 --- a/src/messenger/webim/operator/translate.php +++ b/src/messenger/webim/operator/translate.php @@ -140,8 +140,8 @@ if($stringid) { $page['saved'] = false; $page['key'] = $stringid; $page['target'] = $target; - $page['formoriginal'] = isset($lang1[$stringid]) ? $lang1[$stringid] : ""; - $page['formtranslation'] = $translation; + $page['formoriginal'] = isset($lang1[$stringid]) ? htmlspecialchars($lang1[$stringid]) : ""; + $page['formtranslation'] = htmlspecialchars($translation); start_html_output(); require('../view/translate.php'); exit; diff --git a/src/messenger/webim/styles.css b/src/messenger/webim/styles.css deleted file mode 100644 index 21ad0936..00000000 --- a/src/messenger/webim/styles.css +++ /dev/null @@ -1,346 +0,0 @@ -a { - text-decoration: underline; -} - -a:hover { - text-decoration: none; -} - -ul { - margin-bottom: 10px; - margin-top: 10px; - margin-left: 0px; -} - -li { - margin-left: 18px; - list-style-image: url(images/li.gif); -} - -li.error { - margin-left: 15px; - list-style-image: url(images/li_error.gif); -} - -li.grey { - margin-left: 15px; - list-style-image: url(images/li_grey.gif); -} - -form { - margin-bottom: 0px; - margin-top: 0px; -} - -.bgcn { - background-position: center; - background-repeat: no-repeat; -} - -.bgrn { - background-position: right; - background-repeat: no-repeat; -} - -.bgcy { - background-position: center; - background-repeat: repeat-y; -} - -.bgry { - background-position: right; - background-repeat: repeat-y; -} - -.bgly { - background-position: left; - background-repeat: repeat-y; -} - -.bgbx { - background-position: bottom; - background-repeat: repeat-x; -} - -.textform { - font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; -} - -.textform a { - color: #2971C1; -} - -.text { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #515151; -} - -.text h1 { - margin-bottom: 15px; - margin-top: 0px; - color: #000000; - font-size: 18px; - font-weight: normal; - line-height: 15px; -} - -.text h2 { - margin-bottom: 15px; - margin-top: 0px; - color: #000000; - font-size: 16px; -} - -.text h3 { - margin-bottom: 15px; - margin-top: 0px; - color: #000000; - font-size: 14px; -} - -.text h4 { - margin-bottom: 15px; - margin-top: 0px; - color: #000000; - font-size: 12px; -} - -.text span.date { - font-size: 11px; - color: #FFFFFF; - font-weight: bold; -} - -.text span.sub { - font-size: 11px; - color: #676767; -} - -.text a.sublink { - font-size: 11px; - color: #666666; -} - -.text b.black { - color: #000000; -} - -.text span.black { - color: #000000; -} - -.block { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #515151; -} - -.block h1 { - margin-bottom: 10px; - font-size: 12px; - color: #000000; - font-weight: bold; - line-height: 11px; -} - -.bann { - font-family: Arial, Helvetica, sans-serif; - font-size: 21px; - color: #000000; - line-height: 18px; -} - -.bann span.text { - font-size: 14px; - color: #9F7800; -} - -.bannin { - font-family: Arial, Helvetica, sans-serif; - font-size: 17px; - color: #000000; - line-height: 14px; - font-weight: bold; -} - -.bannin span.text { - font-size: 12px; - color: #9F7800; - font-weight: normal; - white-space: nowrap; -} - -.bannform { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #766037; -} - -.menu { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #000000; -} - -.menu a { - color: #000000; -} - -.smenu { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #165798; -} - -.smenu a { - color: #165798; -} - -.table { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #515151; - padding-left: 5px; - padding-right: 15px; - padding-top: 2px; - padding-bottom: 2px; -} - -.table span.header { - color: #FFFFFF; -} - -.table span.headergrey { - color: #676767; -} - -.table a.black { - color: #000000; -} - -.table span.black { - color: #000000; -} - -.table a.blocked { - color: #e0a0a0; -} - -.address { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #000000; -} - -.address a { - color: #000000; -} - -.phone { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - color: #000000; -} - -.phone span.number { - font-size: 17px; - color: #3D79AD; - font-weight: bold; -} - -td.formauth { - font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - padding-left: 0px; -} - -td.formauth span { - color: #474747; -} - -td.formauth span.formdescr { - font-size: 10px; - color: #676767; -} - -.formauth { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #676767; -} - -input.formauth { - border: 1px solid #878787; -} - -textarea.formauth { - border: 1px solid #878787; - overflow: auto; -} - -.submit a { - font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - text-decoration: none; -} - -.perpage { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - color: #676767; -} - -input.submit { - font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; - font-size: 11px; - color: #000000; - background: transparent; - background-image: url(images/submitbg.gif); - height: 33px; - cursor: hand; - border: none; -} - -.cal { - font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; - font-size: 11px; - color: #515151; -} - -.cal a { - color: #515151; - text-decoration: none; -} - -.cal span { - color: #B70606; -} - -.cal b { - color: #000000; -} - -.firstmessage a { - font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; - font-size: 10px; - text-decoration: none; - color: #6a6a6a; -} - -.firstmessage a:hover { - color: #8a6a6a; -} - -#formmessage { - border: 1px solid #4C96D4; - background-color: #E7F1F9; - padding: 8px 11px; - font-size: 11px; font-weight:bold; - width : 400px; - margin: 5px 2px; -} diff --git a/src/messenger/webim/view/inc_menu.php b/src/messenger/webim/view/inc_menu.php index 9d00756d..9272fae4 100644 --- a/src/messenger/webim/view/inc_menu.php +++ b/src/messenger/webim/view/inc_menu.php @@ -25,6 +25,7 @@ function tpl_menu() { global $page, $webimroot, $errors; >Departments > > + >
  • diff --git a/src/messenger/webim/view/translate.php b/src/messenger/webim/view/translate.php index 3cb41bab..3d75787f 100644 --- a/src/messenger/webim/view/translate.php +++ b/src/messenger/webim/view/translate.php @@ -11,34 +11,11 @@ * Contributors: * Evgeny Gryaznov - initial API and implementation */ + +$page['title'] = getlocal("page.translate.title"); + +function tpl_content() { global $page, $webimroot, $errors; ?> - - - - - - - - - - - <?php echo getlocal("page.translate.title") ?> - <?php echo getlocal("app.title") ?> - - -"> -"> - - - - - - - - -
    - -
    -

    -
    |">
    - @@ -52,70 +29,42 @@

    - - 0 ) { ?> - - - - - - -
    - 0 ) { - print getlocal("errors.header"); - foreach( $errors as $e ) { - print getlocal("errors.prefix"); - print $e; - print getlocal("errors.suffix"); - } - print getlocal("errors.footer"); - } ?> - -
    - +
    -
    - - - - - - - - + + +
    -
    - - - - - - - +
    +
    +
    +
    + +
    +
    -
    - - - - - - -
    - -
    - -
    - - -
    +
    +
    +
    + +
    +
    + +
    + +
    + + +
    + -
    - - - + \ No newline at end of file diff --git a/src/messenger/webim/view/translatelist.php b/src/messenger/webim/view/translatelist.php index c3883b6a..c58fc488 100644 --- a/src/messenger/webim/view/translatelist.php +++ b/src/messenger/webim/view/translatelist.php @@ -11,107 +11,114 @@ * Contributors: * Evgeny Gryaznov - initial API and implementation */ + +require_once("inc_menu.php"); +$page['title'] = getlocal("page.translate.title"); +$page['menuid'] = "translate"; + +function tpl_content() { global $page, $webimroot; ?> - - - - - - - - - - <?php echo getlocal("page.translate.title") ?> - <?php echo getlocal("app.title") ?> - - -"> -"> - - - - - - - - + + + +
    - -
    -

    -
    |">
    - - - +

    -
    - - - - - - - - - - - - - - - -
    - - => - -   - -   - -
    + +
    + +
    +
    + + => + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +

    - - -
    - - - - - - - - - - - - - - -
    Key
    - - - - - -
    -
    - - - -

    -
    - - - -
    - -
    + + + + + + + + + + + + + + + +
    + Key + + + + +
    + + + + + +
    + +
    +"; + echo generate_pagination($page['pagination']); + } +} +?> - - + \ No newline at end of file