diff --git a/Web/App_Code/Models/GuidesModel.cs b/Web/App_Code/Models/GuidesModel.cs index 7cc7e8063..0da41913e 100644 --- a/Web/App_Code/Models/GuidesModel.cs +++ b/Web/App_Code/Models/GuidesModel.cs @@ -83,6 +83,12 @@ public class GuidesModel set; } + public string TitleVideo7 + { + get; + set; + } + public string RelatedTips { get; diff --git a/Web/Controls/Help/ABCIndex/CompleteArticleList.ascx b/Web/Controls/Help/ABCIndex/CompleteArticleList.ascx index f88469eee..646995150 100644 --- a/Web/Controls/Help/ABCIndex/CompleteArticleList.ascx +++ b/Web/Controls/Help/ABCIndex/CompleteArticleList.ascx @@ -671,5 +671,12 @@
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • \ No newline at end of file diff --git a/Web/Controls/Help/Server/Document/DSChangelog.ru.ascx b/Web/Controls/Help/Server/Document/DSChangelog.ru.ascx index e041ce8b4..192f1f11b 100644 --- a/Web/Controls/Help/Server/Document/DSChangelog.ru.ascx +++ b/Web/Controls/Help/Server/Document/DSChangelog.ru.ascx @@ -1,7 +1,26 @@ <%@ Control Language="C#" Inherits="BaseContentUserControls" %>
    ">Открыть в новом окне
    -

    Версия 4.2.9

    +

    Версия 4.2.10

    +

    Дата выпуска: 20.02.2017

    +
    +

    Исправления

    +

    Встраиваемые просмотрщики

    + +

    Лицензирование

    + +

    Серверная часть

    + +
    +
    +
    +

    Версия 4.2.9

    Дата выпуска: 14.02.2017

    Новые функции

    diff --git a/Web/Controls/Help/SiteMap/SiteMap.ascx b/Web/Controls/Help/SiteMap/SiteMap.ascx index 1b8160407..71adf991b 100644 --- a/Web/Controls/Help/SiteMap/SiteMap.ascx +++ b/Web/Controls/Help/SiteMap/SiteMap.ascx @@ -342,6 +342,7 @@
    • +
    • @@ -408,6 +409,9 @@
    • +
  • + +
    • @@ -433,6 +437,9 @@
    • +
  • + +
    • @@ -589,12 +596,12 @@
    • -<%--
  • "> +
  • ">
      -
      • -
      • +
      • +
    -
    • --%> +
  • "> @@ -888,6 +895,7 @@
    • ">
        +
      • @@ -915,6 +923,7 @@
      • ">
          +
        diff --git a/Web/Controls/Help/VariousControls/SocialButtons/SocialButtons.ascx b/Web/Controls/Help/VariousControls/SocialButtons/SocialButtons.ascx index 080ae4c39..a00519881 100644 --- a/Web/Controls/Help/VariousControls/SocialButtons/SocialButtons.ascx +++ b/Web/Controls/Help/VariousControls/SocialButtons/SocialButtons.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" %> <%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> -
        +<%--
        -
        • --%> +
      • Pin It
        • -
      +
    --%> diff --git a/Web/Controls/Help/Video/AllVideoControls/0037_desktop_editors/0037_desktop_editors.ascx b/Web/Controls/Help/Video/AllVideoControls/0037_desktop_editors/0037_desktop_editors.ascx new file mode 100644 index 000000000..fef6987c1 --- /dev/null +++ b/Web/Controls/Help/Video/AllVideoControls/0037_desktop_editors/0037_desktop_editors.ascx @@ -0,0 +1,9 @@ +<%@ Control Language="C#" Inherits="BaseContentUserControls"%> +<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> + \ No newline at end of file diff --git a/Web/Controls/Help/Video/Desktop/DesktopEditors/DesktopEditors.ascx b/Web/Controls/Help/Video/Desktop/DesktopEditors/DesktopEditors.ascx new file mode 100644 index 000000000..6fc794d5d --- /dev/null +++ b/Web/Controls/Help/Video/Desktop/DesktopEditors/DesktopEditors.ascx @@ -0,0 +1,31 @@ +<%@ Control Language="C#" Inherits="BaseContentUserControls"%> +<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> + + + +
    + +

    ONLYOFFICE Desktop Editors - free office suite for offline document editing and collaboration

    + <%--
    +
      +
    • +
    +
    --%> +
    + +
    +
    +

    ONLYOFFICE Desktop Editors is free and open source office suite for viewing and editing text documents, spreadsheets and presentations without the Internet connection.

    +
    + +
    \ No newline at end of file diff --git a/Web/css/help.less b/Web/css/help.less index dd35d859d..a6ead5aa3 100644 --- a/Web/css/help.less +++ b/Web/css/help.less @@ -1564,7 +1564,7 @@ a.closeContainerButton { } .InnerPage.HelpCenterMain { .search_line { - top: 34px; + top: -47px; } } .PdfHowto { @@ -2282,6 +2282,9 @@ span.playbackbutton.presentation { .third_party_dropbox { background-image: url(/images/help/video/new/third_party_dropbox.png); } +.third_party_box { + background-image: url(/images/help/video/new/third_party_box.png); +} .connect_document_windows { background-image: url(/images/help/video/new/connect_document_windows.png); } @@ -2297,6 +2300,9 @@ span.playbackbutton.presentation { .co_editing { background-image: url(/images/help/video/new/co-editing.png); } +.desktop_editors_video { + background-image: url(/images/help/video/new/desktop_editors.png); +} .strikethrough { text-decoration: underline; } @@ -2427,7 +2433,7 @@ span.label { .leftmenu_mobile_document_editor_expand, .leftmenu_mobile_spreadsheet_editor_expand, .leftmenu_mobile_presentation_editor_expand, .mobile_document_editor_expand_menu, .mobile_spreadsheet_editor_expand_menu, .howworks_expand_menu, .registering_expand_menu, .preparing_expand_menu, .earning_expand_menu, .registering .leftmenu_registering, .preparing .leftmenu_preparing, .earning .leftmenu_earning, .trainingcenterpage .leftmenu_trainingcenter, .introduction .leftmenu_introduction, .presentation .leftmenu_presentation, .gs_expand_menu, .contributorguidespage .guides_expand_menu, .guides_expand_menu, .f_a_q_expand_menu, .video_expand_menu, .tips_expand_menu, .troubleshooting_expand_menu, .general_expand_menu, .documents_expand_menu, .projects_expand_menu, .crm_expand_menu, .people_expand_menu, .community_expand_menu, .mail_expand_menu, .calendar_expand_menu, .talk_expand_menu, .documenteditor_expand_menu, .leftmenu_documenteditor_toggle_expand_menu, .leftmenu_spreadsheeteditor_toggle_expand_menu, .leftmenu_presentationeditor_toggle_expand_menu, .documenteditor_ui_expand_menu, .documenteditor_hh_expand_menu, .presentationeditor_expand_menu, .presentationeditor_ui_expand_menu, .presentationeditor_hh_expand_menu, .spreadsheeteditor_expand_menu, .spreadsheeteditor_ui_expand_menu, .spreadsheeteditor_hh_expand_menu, .editors_expand_menu, .mobileprojects_expand_menu, .mobile_documents_android_expand_menu, .mobile_documents_expand_menu, .mobiledocuments_expand_menu { display: none; } -.spreadsheet_editor_basic .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_basic_operations, .spreadsheet_editor_cell .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_cell_properties, .spreadsheet_editor_text .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_text_formatting, .spreadsheet_editor_rows .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_edit_rows_columns, .spreadsheet_editor_sheet .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_sheet_operations, .spreadsheet_editor_functions .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_use_functions, .insertfunction .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_use_functions, .spreadsheet_editor_objects .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_operations_objects, .spreadsheet_editor_coediting .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_spreadsheet_coediting, .spreadsheet_editor_tools .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_tools_settings, .spreadsheet_editor_hints .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_helpful_hints, .document_editor_basic .leftmenu_documenteditor_toggle_expand_menu.leftmenu_basic_operations, .document_editor_page .leftmenu_documenteditor_toggle_expand_menu.leftmenu_page_formatting, .document_editor_paragraph .leftmenu_documenteditor_toggle_expand_menu.leftmenu_paragraph_formatting, .document_editor_text .leftmenu_documenteditor_toggle_expand_menu.leftmenu_text_formatting, .document_editor_objects .leftmenu_documenteditor_toggle_expand_menu.leftmenu_operations_objects, .document_editor_mailmerge .leftmenu_documenteditor_toggle_expand_menu.leftmenu_mail_merge, .document_editor_equations .leftmenu_documenteditor_toggle_expand_menu.leftmenu_math_equations, .document_editor_coediting .leftmenu_documenteditor_toggle_expand_menu.leftmenu_document_coediting, .document_editor_tools .leftmenu_documenteditor_toggle_expand_menu.leftmenu_tools_settings, .document_editor_hints .leftmenu_documenteditor_toggle_expand_menu.leftmenu_helpful_hints, .presentation_editor_basic .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_basic_operations, .presentation_editor_text .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_text_formatting, .presentation_editor_objects .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_operations_objects, .presentation_editor_slides .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_work_with_slides, .presentation_editor_coediting .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_presentation_coediting, .presentation_editor_tools .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_tools_settings, .presentation_editor_hints .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_helpful_hints, .documents_basic .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_basic_operations, .documents_sheets .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_sheets_management, .documents_text .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_text_formatting, .documents_cells .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_cell_properties, .documents_rows .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_rows_columns, .documents_objects .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_object_operations, .documents_tools .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_tools_settings, .documents_tools .leftmenu_mobile_document_editor_expand.leftmenu_tools_settings, .documents_text .leftmenu_mobile_document_editor_expand.leftmenu_text_formatting, .documents_paragraph .leftmenu_mobile_document_editor_expand.leftmenu_paragraph_formatting, .documents_page .leftmenu_mobile_document_editor_expand.leftmenu_page_formatting, .documents_objects .leftmenu_mobile_document_editor_expand.leftmenu_operations_objects, .documents_basic .leftmenu_mobile_document_editor_expand.leftmenu_basic_operations, .mobile_document_editor .mobile_document_editor_expand_menu, .mobile_spreadsheet_editor .mobile_spreadsheet_editor_expand_menu, .partners_faq .howworks_expand_menu, .howworks .howworks_expand_menu, .registering .registering_expand_menu, .preparing .preparing_expand_menu, .earning .earning_expand_menu, .description .MainHelpCenter .leftmenu_documenteditor_toggle_expand_menu, .description .MainHelpCenter .leftmenu_spreadsheeteditor_toggle_expand_menu, .description .MainHelpCenter .leftmenu_presentationeditor_toggle_expand_menu, .description .MainHelpCenter .documenteditor_ui_expand_menu, .description .MainHelpCenter .documenteditor_hh_expand_menu, .description .MainHelpCenter .spreadsheeteditor_ui_expand_menu, .description .MainHelpCenter .spreadsheeteditor_hh_expand_menu, .description .MainHelpCenter .presentationeditor_ui_expand_menu, .description .MainHelpCenter .presentationeditor_hh_expand_menu, .mobilegettingstartedpages .mobiledocuments_expand_menu, .mobileappspage .mobiledocuments_expand_menu, .mobileguidespages .mobiledocuments_expand_menu, .gettingstartedpages .gs_expand_menu, .mobilegettingstartedpages .mobile_documents_expand_menu, .mobileguidespages .mobile_documents_expand_menu, .faqpage .f_a_q_expand_menu, .gs_configurationpage .general_expand_menu, .documents .documents_expand_menu, .gs_documentspage .documents_expand_menu, .projects .projects_expand_menu, .gs_projectspage .projects_expand_menu, .crm .crm_expand_menu, .gs_crmpage .crm_expand_menu, .people .people_expand_menu, .gs_peoplepage .people_expand_menu, .community .community_expand_menu, .gs_communitypage .community_expand_menu, .mail .mail_expand_menu, .gs_mailpage .mail_expand_menu, .calendar .calendar_expand_menu, .gs_calendarpage .calendar_expand_menu, .talk .talk_expand_menu, .gs_talkpage .talk_expand_menu, .technology .editors_expand_menu, .teamlabeditorspage .editors_expand_menu, .documenteditor .editors_expand_menu, .documenteditor .documenteditor_expand_menu, .documenteditor_ui .documenteditor_ui_expand_menu, .documenteditor_hh .documenteditor_hh_expand_menu, .spreadsheeteditor .editors_expand_menu, .spreadsheeteditor .spreadsheeteditor_expand_menu, .spreadsheeteditor_ui .spreadsheeteditor_ui_expand_menu, .spreadsheeteditor_hh .spreadsheeteditor_hh_expand_menu, .presentationeditor .editors_expand_menu, .presentationeditor .presentationeditor_expand_menu, .presentationeditor_ui .presentationeditor_ui_expand_menu, .presentationeditor_hh .presentationeditor_hh_expand_menu, .mobileappspage .mobileprojects_expand_menu, .mobileprojects .mobileprojects_expand_menu, .android_documents .mobile_documents_android_expand_menu, .mobile_documents_ios .mobile_documents_expand_menu, .mobile_document_editor .mobile_documents_expand_menu, .mobile_spreadsheet .mobile_documents_expand_menu, .mobile_documents_ios .mobiledocuments_expand_menu, .mobile_document_editor .mobiledocuments_expand_menu, .mobile_spreadsheet_editor .mobiledocuments_expand_menu { +.spreadsheet_editor_basic .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_basic_operations, .spreadsheet_editor_cell .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_cell_properties, .spreadsheet_editor_text .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_text_formatting, .spreadsheet_editor_rows .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_edit_rows_columns, .spreadsheet_editor_sheet .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_sheet_operations, .spreadsheet_editor_functions .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_use_functions, .insertfunction .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_use_functions, .spreadsheet_editor_objects .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_operations_objects, .spreadsheet_editor_equations .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_math_equations, .spreadsheet_editor_coediting .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_spreadsheet_coediting, .spreadsheet_editor_tools .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_tools_settings, .spreadsheet_editor_hints .leftmenu_spreadsheeteditor_toggle_expand_menu.leftmenu_helpful_hints, .document_editor_basic .leftmenu_documenteditor_toggle_expand_menu.leftmenu_basic_operations, .document_editor_page .leftmenu_documenteditor_toggle_expand_menu.leftmenu_page_formatting, .document_editor_paragraph .leftmenu_documenteditor_toggle_expand_menu.leftmenu_paragraph_formatting, .document_editor_text .leftmenu_documenteditor_toggle_expand_menu.leftmenu_text_formatting, .document_editor_objects .leftmenu_documenteditor_toggle_expand_menu.leftmenu_operations_objects, .document_editor_mailmerge .leftmenu_documenteditor_toggle_expand_menu.leftmenu_mail_merge, .document_editor_equations .leftmenu_documenteditor_toggle_expand_menu.leftmenu_math_equations, .document_editor_coediting .leftmenu_documenteditor_toggle_expand_menu.leftmenu_document_coediting, .document_editor_tools .leftmenu_documenteditor_toggle_expand_menu.leftmenu_tools_settings, .document_editor_hints .leftmenu_documenteditor_toggle_expand_menu.leftmenu_helpful_hints, .presentation_editor_basic .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_basic_operations, .presentation_editor_text .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_text_formatting, .presentation_editor_objects .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_operations_objects, .presentation_editor_slides .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_work_with_slides, .presentation_editor_equations .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_math_equations, .presentation_editor_coediting .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_presentation_coediting, .presentation_editor_tools .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_tools_settings, .presentation_editor_hints .leftmenu_presentationeditor_toggle_expand_menu.leftmenu_helpful_hints, .documents_basic .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_basic_operations, .documents_sheets .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_sheets_management, .documents_text .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_text_formatting, .documents_cells .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_cell_properties, .documents_rows .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_rows_columns, .documents_objects .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_object_operations, .documents_tools .leftmenu_mobile_spreadsheet_editor_expand.leftmenu_tools_settings, .documents_tools .leftmenu_mobile_document_editor_expand.leftmenu_tools_settings, .documents_text .leftmenu_mobile_document_editor_expand.leftmenu_text_formatting, .documents_paragraph .leftmenu_mobile_document_editor_expand.leftmenu_paragraph_formatting, .documents_page .leftmenu_mobile_document_editor_expand.leftmenu_page_formatting, .documents_objects .leftmenu_mobile_document_editor_expand.leftmenu_operations_objects, .documents_basic .leftmenu_mobile_document_editor_expand.leftmenu_basic_operations, .mobile_document_editor .mobile_document_editor_expand_menu, .mobile_spreadsheet_editor .mobile_spreadsheet_editor_expand_menu, .partners_faq .howworks_expand_menu, .howworks .howworks_expand_menu, .registering .registering_expand_menu, .preparing .preparing_expand_menu, .earning .earning_expand_menu, .description .MainHelpCenter .leftmenu_documenteditor_toggle_expand_menu, .description .MainHelpCenter .leftmenu_spreadsheeteditor_toggle_expand_menu, .description .MainHelpCenter .leftmenu_presentationeditor_toggle_expand_menu, .description .MainHelpCenter .documenteditor_ui_expand_menu, .description .MainHelpCenter .documenteditor_hh_expand_menu, .description .MainHelpCenter .spreadsheeteditor_ui_expand_menu, .description .MainHelpCenter .spreadsheeteditor_hh_expand_menu, .description .MainHelpCenter .presentationeditor_ui_expand_menu, .description .MainHelpCenter .presentationeditor_hh_expand_menu, .mobilegettingstartedpages .mobiledocuments_expand_menu, .mobileappspage .mobiledocuments_expand_menu, .mobileguidespages .mobiledocuments_expand_menu, .gettingstartedpages .gs_expand_menu, .mobilegettingstartedpages .mobile_documents_expand_menu, .mobileguidespages .mobile_documents_expand_menu, .faqpage .f_a_q_expand_menu, .gs_configurationpage .general_expand_menu, .documents .documents_expand_menu, .gs_documentspage .documents_expand_menu, .projects .projects_expand_menu, .gs_projectspage .projects_expand_menu, .crm .crm_expand_menu, .gs_crmpage .crm_expand_menu, .people .people_expand_menu, .gs_peoplepage .people_expand_menu, .community .community_expand_menu, .gs_communitypage .community_expand_menu, .mail .mail_expand_menu, .gs_mailpage .mail_expand_menu, .calendar .calendar_expand_menu, .gs_calendarpage .calendar_expand_menu, .talk .talk_expand_menu, .gs_talkpage .talk_expand_menu, .technology .editors_expand_menu, .teamlabeditorspage .editors_expand_menu, .documenteditor .editors_expand_menu, .documenteditor .documenteditor_expand_menu, .documenteditor_ui .documenteditor_ui_expand_menu, .documenteditor_hh .documenteditor_hh_expand_menu, .spreadsheeteditor .editors_expand_menu, .spreadsheeteditor .spreadsheeteditor_expand_menu, .spreadsheeteditor_ui .spreadsheeteditor_ui_expand_menu, .spreadsheeteditor_hh .spreadsheeteditor_hh_expand_menu, .presentationeditor .editors_expand_menu, .presentationeditor .presentationeditor_expand_menu, .presentationeditor_ui .presentationeditor_ui_expand_menu, .presentationeditor_hh .presentationeditor_hh_expand_menu, .mobileappspage .mobileprojects_expand_menu, .mobileprojects .mobileprojects_expand_menu, .android_documents .mobile_documents_android_expand_menu, .mobile_documents_ios .mobile_documents_expand_menu, .mobile_document_editor .mobile_documents_expand_menu, .mobile_spreadsheet .mobile_documents_expand_menu, .mobile_documents_ios .mobiledocuments_expand_menu, .mobile_document_editor .mobiledocuments_expand_menu, .mobile_spreadsheet_editor .mobiledocuments_expand_menu { display: block; } .insertfunction .leftmenu_spreadsheeteditor_insertfunction, .control_panel .leftmenu_controlpanel, .saas_version .leftmenu_cloud, .virtual_version .leftmenu_virtual, .virtual .leftmenu_virtual, .virtual .leftmenu_enterprise, .enterprise .leftmenu_enterprise, .documents .leftmenu_documentserver, .windows_version .leftmenu_windows, .desktop_macos_version .leftmenu_macos, .desktop_windows_version .leftmenu_windows, .linux_version .leftmenu_linux, .desktop_linux_version .leftmenu_linux, .docker_version .leftmenu_docker, .one_click_install .leftmenu_oneclick, .common_all_os .leftmenu_all_os, .all_platforms .leftmenu_all_os, .oneclick .leftmenu_oneclickinstall, .general .leftmenu_communityserver, .mail .leftmenu_mailserver, .general .leftmenu_general, .documents .leftmenu_documents, .documents .leftmenu_mobile_documents, .projects .leftmenu_projects, .crm .leftmenu_crm, .people .leftmenu_people, .community .leftmenu_community, .calendar .leftmenu_calendar, .mail .leftmenu_mail, .talk .leftmenu_talk, .getting_startedpage .leftmenu_getting_started, .gs_documentspage .leftmenu_documents, .gs_projectspage .leftmenu_projects, .gs_crmpage .leftmenu_crm, .gs_peoplepage .leftmenu_people, .gs_communitypage .leftmenu_community, .gs_configurationpage .leftmenu_general, .gs_calendarpage .leftmenu_calendar, .gs_mailpage .leftmenu_mail, .gs_talkpage .leftmenu_talk, .troubleshootingpage.mail .leftmenu_troubleshooting_mail, .troubleshootingpage.general .leftmenu_troubleshooting_server, .troubleshootingpage.people .leftmenu_troubleshooting_people, .troubleshootingpage.general .leftmenu_troubleshooting_general, .troubleshootingpage.calendar .leftmenu_troubleshooting_calendar, .troubleshootingpage.projects .leftmenu_troubleshooting_projects, .troubleshootingpage.documents .leftmenu_troubleshooting_documents, .troubleshootingpage.community .leftmenu_troubleshooting_community, .troubleshootingpage.talk .leftmenu_troubleshooting_talk, .troubleshootingpage.crm .leftmenu_troubleshooting_crm, .contributorguidespage .leftmenu_countributors_guides { @@ -2948,9 +2954,11 @@ p.move_closer { top: 82px; width: 264px; } -.MainHelpCenter h2:before, -.gs_content:before, -.gloss_capital:before { +.MainHelpCenter p[id]:before, +.MainHelpCenter h2[id]:before, +.MainHelpCenter h3[id]:before, +.gs_content[id]:before, +.gloss_capital[id]:before { display: block; content: ""; height: 91px; @@ -3294,23 +3302,11 @@ em.error_text { } .pvl_outdated { - display: inline-block; - color: @buttonTextColor; background-color: @redColor; - padding: 1px 10px 1px 5px; - margin: -1px -10px -1px 5px; - text-align: left; - .borderRadiusCustomizable(0, 2px, 2px, 0); } .pvl_current { - display: inline-block; - color: @buttonTextColor; background-color: @greenColor; - padding: 1px 10px 1px 5px; - margin: -1px -10px -1px 5px; - text-align: left; - .borderRadiusCustomizable(0, 2px, 2px, 0); } } span.param-type { diff --git a/Web/css/teamlab.less b/Web/css/teamlab.less index 03292fe74..9b75070fd 100644 --- a/Web/css/teamlab.less +++ b/Web/css/teamlab.less @@ -5,7 +5,7 @@ &.HelpCenterMain { .description { .menuleft { - margin-top: 85px; + margin-top: 4px; } } } diff --git a/Web/js/scripts.js b/Web/js/scripts.js index d05d81aa7..b40f1b650 100644 --- a/Web/js/scripts.js +++ b/Web/js/scripts.js @@ -82,7 +82,7 @@ var LanguageSelectorManager = new function () { var init = function () { $("div. $(function () { LanguageSelectorManager.init(), $(document).keyup(function (event) { if ($(".blockUI").is(":visible")) { var code; if (!e) var e = event; e.keyCode ? code = e.keyCode : e.which && (code = e.which), 27 == code && $.unblockUI() } }) }); /* core/modalscontroller.min.js */ -function Search(path) { var url = new String, search = document.getElementById("txtSearch").value; return null != search && search.length > 0 && search != $("#helpmark").val() ? (url = path + "?text=" + encodeURIComponent(search), void (window.location.href = url)) : void (window.location.href = path) } function tooltip(target_items, name) { $(target_items).each(function () { var id = $.trim($(this).attr("id")).split("_")[1], title = $.trim($(this).attr("title")); if ("" != title && null != title) { $("body").append(""); var my_tooltip = $("#" + name + id); $(this).removeAttr("title").mouseover(function () { my_tooltip.show() }).mousemove(function (kmouse) { my_tooltip.css({ left: kmouse.pageX + 15, top: kmouse.pageY + 15 }) }).mouseout(function () { my_tooltip.hide() }) } }) } function textPaste(target_items, name) { $(target_items).each(function () { var title = ($.trim($(this).attr("id")).split("_")[1], $.trim($(this).attr("title"))); "" != title && null != title && $(this).removeAttr("title").after("

    " + title + "

    ") }) } function showVideoContainer() { displayModalPanel("VideoContainer") } function showVideoContainer2() { displayModalPanel("VideoContainer2") } function showVideoContainer3() { displayModalPanel("VideoContainer3") } function showVideoContainer4() { displayModalPanel("VideoContainer4") } function showVideoContainer5() { displayModalPanel("VideoContainer5") } function showVideoContainer6() { displayModalPanel("VideoContainer6") } function HelpCenterMasterInit() { $(window).scroll(function () { if ($("a[name=comments]").length) { var distanceTop = $("a[name=comments]").offset().top - $(window).height(); $(window).scrollTop() > distanceTop ? ($("#PopupAlsoBlock").animate({ right: "0px" }, 200), $("#SeeAlsoBlock").html($("#SeeAlsoBlockLinks").html())) : $("#PopupAlsoBlock").stop(!0).animate({ right: "-430px" }, 100) } }), $("#PopupAlsoBlock .close").bind("click", function () { $(this).parent().remove() }) } function IndexPageInit(watermarkText, searchText, searchPath) { $("#navitem_help").attr("class", "navCurrentItem"), $("#txtSearch").Watermark(watermarkText, "#7A7A7A"), $("#txtSearch").val(searchText), $("#txtSearch").unbind("keyup").bind("keyup", function (event) { return 13 == event.keyCode ? void Search(searchPath) : void 0 }), $("#SearchExample").click(function () { $("#txtSearch").val($("#SearchExample").text()), $("#txtSearch").focus(), Search(searchPath) }), $("#switcherMenu span").on("click", function () { var type = $(this).attr("data-name"), value = getCookie("type-menu"); $("[id$=ListMenu]").hide(), $("[id$=MainContent]").hide(), $("#switcherMenu span").removeClass("active"), $(this).addClass("active"), $("#" + type + "ListMenu").show(), $("#" + type + "MainContent").show(), value != type && setCookie("type-menu", type) }) } $(function () { $(".screenphoto").click(function () { $img = $("#" + $(this).attr("target")); var alt = $img.attr("alt"), path = $("#" + $(this).attr("target")).attr("src"); $("#scrHelpContent").html($("#scrHelpTemplate").tmpl({ CurScreen: path, curalt: alt })), $("#scrHelpContainer").width($img.width() + "px"), displayModalPanel("scrHelpContainer") }), $(".text-container-link").on("click", function () { $id = $("#" + $(this).attr("data-content")), $("#textHelpContent").html($id.html()), $("#textHelpContainer .tag_name").text($(this).text()), displayModalPanel("textHelpContainer") }), $(".text-container-link-changelog").on("click", function () { $id = $("#" + $(this).attr("data-content")), $("#textHelpContentChangelog").html($id.html()), $("#textHelpContainerChangelog .tag_name").text($(this).text()), displayModalPanel("textHelpContainerChangelog") }) }); +function Search(path) { var url = new String, search = document.getElementById("txtSearch").value; return null != search && search.length > 0 && search != $("#helpmark").val() ? (url = path + "?text=" + encodeURIComponent(search), void (window.location.href = url)) : void (window.location.href = path) } function tooltip(target_items, name) { $(target_items).each(function () { var id = $.trim($(this).attr("id")).split("_")[1], title = $.trim($(this).attr("title")); if ("" != title && null != title) { $("body").append(""); var my_tooltip = $("#" + name + id); $(this).removeAttr("title").mouseover(function () { my_tooltip.show() }).mousemove(function (kmouse) { my_tooltip.css({ left: kmouse.pageX + 15, top: kmouse.pageY + 15 }) }).mouseout(function () { my_tooltip.hide() }) } }) } function textPaste(target_items, name) { $(target_items).each(function () { var title = ($.trim($(this).attr("id")).split("_")[1], $.trim($(this).attr("title"))); "" != title && null != title && $(this).removeAttr("title").after("

    " + title + "

    ") }) } function showVideoContainer() { displayModalPanel("VideoContainer") } function showVideoContainer2() { displayModalPanel("VideoContainer2") } function showVideoContainer3() { displayModalPanel("VideoContainer3") } function showVideoContainer4() { displayModalPanel("VideoContainer4") } function showVideoContainer5() { displayModalPanel("VideoContainer5") } function showVideoContainer6() { displayModalPanel("VideoContainer6") } function showVideoContainer7() { displayModalPanel("VideoContainer7") } function HelpCenterMasterInit() { $(window).scroll(function () { if ($("a[name=comments]").length) { var distanceTop = $("a[name=comments]").offset().top - $(window).height(); $(window).scrollTop() > distanceTop ? ($("#PopupAlsoBlock").animate({ right: "0px" }, 200), $("#SeeAlsoBlock").html($("#SeeAlsoBlockLinks").html())) : $("#PopupAlsoBlock").stop(!0).animate({ right: "-430px" }, 100) } }), $("#PopupAlsoBlock .close").bind("click", function () { $(this).parent().remove() }) } function IndexPageInit(watermarkText, searchText, searchPath) { $("#navitem_help").attr("class", "navCurrentItem"), $("#txtSearch").Watermark(watermarkText, "#7A7A7A"), $("#txtSearch").val(searchText), $("#txtSearch").unbind("keyup").bind("keyup", function (event) { return 13 == event.keyCode ? void Search(searchPath) : void 0 }), $("#SearchExample").click(function () { $("#txtSearch").val($("#SearchExample").text()), $("#txtSearch").focus(), Search(searchPath) }), $("#switcherMenu span").on("click", function () { var type = $(this).attr("data-name"), value = getCookie("type-menu"); $("[id$=ListMenu]").hide(), $("[id$=MainContent]").hide(), $("#switcherMenu span").removeClass("active"), $(this).addClass("active"), $("#" + type + "ListMenu").show(), $("#" + type + "MainContent").show(), value != type && setCookie("type-menu", type) }) } $(function () { $(".screenphoto").click(function () { $img = $("#" + $(this).attr("target")); var alt = $img.attr("alt"), path = $("#" + $(this).attr("target")).attr("src"); $("#scrHelpContent").html($("#scrHelpTemplate").tmpl({ CurScreen: path, curalt: alt })), $("#scrHelpContainer").width($img.width() + "px"), displayModalPanel("scrHelpContainer") }), $(".text-container-link").on("click", function () { $id = $("#" + $(this).attr("data-content")), $("#textHelpContent").html($id.html()), $("#textHelpContainer .tag_name").text($(this).text()), displayModalPanel("textHelpContainer") }), $(".text-container-link-changelog").on("click", function () { $id = $("#" + $(this).attr("data-content")), $("#textHelpContentChangelog").html($id.html()), $("#textHelpContainerChangelog .tag_name").text($(this).text()), displayModalPanel("textHelpContainerChangelog") }) }); /* help/dropit.min.js */ !function ($) { $.fn.dropit = function (method) { var methods = { init: function (options) { return this.dropit.settings = $.extend({}, this.dropit.defaults, options), this.each(function () { var $el = $(this), settings = $.fn.dropit.settings; $el.addClass("dropit").find(">" + settings.triggerParentEl + ":has(" + settings.submenuEl + ")").addClass("dropit-trigger").find(settings.submenuEl).addClass("dropit-submenu").hide(), $el.off(settings.action).on(settings.action, settings.triggerParentEl + ":has(" + settings.submenuEl + ") > " + settings.triggerEl, function () { return "click" == settings.action && $(this).parents(settings.triggerParentEl).hasClass("dropit-open") ? (settings.beforeHide.call(this), $(this).parents(settings.triggerParentEl).removeClass("dropit-open").find(settings.submenuEl).hide(), settings.afterHide.call(this), !1) : (settings.beforeHide.call(this), $(".dropit-open").removeClass("dropit-open").find(".dropit-submenu").hide(), settings.afterHide.call(this), settings.beforeShow.call(this), $(this).parents(settings.triggerParentEl).addClass("dropit-open").find(settings.submenuEl).show(), settings.afterShow.call(this), !1) }), $(document).on("click", function () { settings.beforeHide.call(this), $(".dropit-open").removeClass("dropit-open").find(".dropit-submenu").hide(), settings.afterHide.call(this) }), "mouseenter" == settings.action && $el.on("mouseleave", ".dropit-open", function () { settings.beforeHide.call(this), $(this).removeClass("dropit-open").find(settings.submenuEl).hide(), settings.afterHide.call(this) }), settings.afterLoad.call(this) }) } }; return methods[method] ? methods[method].apply(this, Array.prototype.slice.call(arguments, 1)) : "object" != typeof method && method ? void $.error('Method "' + method + '" does not exist in dropit plugin!') : methods.init.apply(this, arguments) }, $.fn.dropit.defaults = { action: "click", submenuEl: "ul", triggerEl: "a", triggerParentEl: "li", afterLoad: function () { }, beforeShow: function () { }, afterShow: function () { }, beforeHide: function () { }, afterHide: function () { } }, $.fn.dropit.settings = {} }(jQuery);