Merge pull request #204 from ONLYOFFICE/bugfix/hide-tooltip

replace hiding portal-info block from js to templates

build/msbuild/zip.proj

@@ -4,9 +4,9 @@
   <PropertyGroup>
     <To Condition=" '$(To)' == '' ">..\deploy\</To>
     <RootDir Condition="$(RootDir)==''">..\..\</RootDir>
-    <NameCSharp>$(To).Net (C#) Example</NameCSharp>
+    <NameCSharp>$(To)DotNet (Csharp) Example</NameCSharp>
     <DirCSharp>$(RootDir)web\documentserver-example\csharp\</DirCSharp>
-    <NameMvc>$(To).Net (C# MVC) Example</NameMvc>
+    <NameMvc>$(To)DotNet (Csharp MVC) Example</NameMvc>
     <DirMvc>$(RootDir)web\documentserver-example\csharp-mvc\</DirMvc>
     <NameJava>$(To)Java Example</NameJava>
     <DirJava>$(RootDir)web\documentserver-example\java\</DirJava>

web/documentserver-example/csharp-mvc/Scripts/jscript.js

@@ -289,10 +289,6 @@ if (typeof jQuery != "undefined") {
     };
 
     var fileList = jq("tr.tableRow");
-    if (fileList.length > 0) {
-        console.log(jq("div#portal-info").is(":visible"));
-        jq("div#portal-info").hide();
-    }
 
     var mouseIsOverTooltip = false;
     var hideTooltipTimeout = null;

web/documentserver-example/csharp-mvc/Views/Home/Index.aspx

@@ -82,11 +82,11 @@
                                     <tr>
                                         <td valign="middle">
                                             <span class="select-user">Username</span>
-                                             <img class="info" src="content/images/info.svg" />
+                                             <img class="info" src="app_themes/images/info.svg" />
                                              <select class="select-user" id="user">
                                             <% foreach (User user in Users.getAllUsers())
                                                { %>
-                                                    <option><%= user.name.IsEmpty() ? "Anonymous" : user.name %></option>
+                                                    <b><%= user.name.IsEmpty() ? "Anonymous" : user.name %></b>
                                                  <% } %>
                                              </select>
                                         </td>
@@ -134,9 +134,9 @@
                         </div>
                     </td>
                     <td class="section">
+                    <% var storedFiles = GetStoredFiles(); %>
                         <div class="main-panel">
-                            <% var storedFiles = DocManagerHelper.GetStoredFiles(); %>
-                            <div id="portal-info"  style="display: <%= storedFiles.Any() ? "none" : "block" %>">
+                            <div id="portal-info" style="display: <%= storedFiles.Any() ? "none" : "block" %>">
                                 <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                                 <span class="portal-descr">
                                     Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.
@@ -157,30 +157,29 @@
                                    <% } %>
                             </div>
                             <%
-                                if (storedFiles.Any())
+                                if storedFiles.Any())
                                 { %>
-                                    <div class="stored-list">
-                                        <span class="header-list">Your documents</span>
-                                        <table class="tableHeader" cellspacing="0" cellpadding="0" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
-                                                    <td class="tableHeaderCell tableHeaderCellEditors contentCells-shift">Editors</td>
-                                                    <td class="tableHeaderCell tableHeaderCellViewers">Viewers</td>
-                                                    <td class="tableHeaderCell tableHeaderCellDownload">Download</td>
-                                                    <td class="tableHeaderCell tableHeaderCellRemove">Remove</td>
-                                                </tr>
-                                            </thead>
-                                        </table>
-                                        <div class="scroll-table-body">
-                                            <table cellspacing="0" cellpadding="0" width="100%">
-                                                <tbody>
-                                                    <%  foreach (var storedFile in storedFiles)
-                                                        { 
-                                                            var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
-                                                            var docType = FileUtility.GetFileType(storedFile.Name).ToString().ToLower(); 
-                                                            var canEdit = DocManagerHelper.EditedExts.Contains(Path.GetExtension(storedFile.Name).ToLower());
-                                                        %>
+                                <div class="stored-list">
+                                    <span class="header-list">Your documents</span>
+                                    <table class="tableHeader" cellspacing="0" cellpadding="0" width="100%">
+                                        <thead>
+                                            <tr >
+                                                <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
+                                                <td class="tableHeaderCell tableHeaderCellEditors contentCells-shift">Editors</td>
+                                                <td class="tableHeaderCell tableHeaderCellViewers">Viewers</td>
+                                                <td class="tableHeaderCell tableHeaderCellDownload">Download</td>
+                                                <td class="tableHeaderCell tableHeaderCellRemove">Remove</td>
+                                            </tr>
+                                        </thead>
+                                    </table>
+                                    <div class="scroll-table-body">
+                                        <table cellspacing="0" cellpadding="0" width="100%">
+                                            <tbody>
+                                            <%  foreach (var storedFile in storedFiles)
+                                                {
+                                                    var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
+                                                    var docType = DocumentType(storedFile.Name);
+                                                    var canEdit = EditedExts.Contains(Path.GetExtension(storedFile.Name).ToLower());
 
                                                             <tr class="tableRow" title="<%= storedFile.Name %> [<%= DocManagerHelper.GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress) %>]">
                                                                 <td class="contentCells">
@@ -188,7 +187,7 @@
                                                                         <span><%= storedFile.Name %></span>
                                                                     </a>
                                                                 </td>
-                                                                <% if (canEdit) { %>
+                                                                <% if (canEdir) { %>
                                                                     <td class="contentCells contentCells-icon">
                                                                         <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "edit" }) %>" target="_blank">
                                                                             <img src="content/images/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens"/>

web/documentserver-example/csharp/Default.aspx

@@ -135,8 +135,9 @@
                             </div>
                         </td>
                         <td class="section">
+                        <% var storedFiles = GetStoredFiles(); %>
                             <div class="main-panel">
-                                <div id="portal-info">
+                                <div id="portal-info" style="display: <%= storedFiles.Any() ? "none" : "block" %>">
                                     <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                                     <span class="portal-descr">
                                         Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.
@@ -156,7 +157,7 @@
                                        </div>
                                        <% } %>
                                 </div>
-                            <%  var storedFiles = GetStoredFiles();
+                            <%
                                 if storedFiles.Any())
                                 { %>
                                     <div class="stored-list">

web/documentserver-example/csharp/script/jscript.js

@@ -288,10 +288,6 @@ if (typeof jQuery != "undefined") {
     };
 
     var fileList = jq("tr.tableRow");
-    if (fileList.length > 0) {
-        console.log(jq("div#portal-info").is(":visible"));
-        jq("div#portal-info").hide();
-    }
 
     var mouseIsOverTooltip = false;
     var hideTooltipTimeout = null;

web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js

@@ -302,9 +302,6 @@ if (typeof jQuery !== "undefined") {
     jq("#portal-info")[0].innerHTML += jq("#portal-info")[0].attributes.tooltip.value;
 
     var fileList = jq("tr.tableRow");
-    if (fileList.length > 0) {
-        jq("div#portal-info").hide();
-    }
 
     var mouseIsOverTooltip = false;
     var hideTooltipTimeout = null;

web/documentserver-example/java-spring/src/main/resources/templates/index.html

@@ -124,7 +124,7 @@
                 </td>
                 <td class="section">
                     <div class="main-panel">
-                        <div id="portal-info" th:attr="tooltip=${tooltip}">
+                        <div id="portal-info" th:attr="tooltip=${tooltip}" th:style="${not #lists.isEmpty(files)} ? 'display: none' : 'display: block' ">
                             <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                             <span class="portal-descr">
                                     Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.

web/documentserver-example/java/src/main/webapp/index.jsp

@@ -133,8 +133,10 @@
                             </div>
                         </td>
                         <td class="section">
+                            <% DocumentManager.Init(request, response); %>
+                            <% File[] files = DocumentManager.GetStoredFiles(null); %>
                             <div class="main-panel">
-                                <div id="portal-info">
+                                <div id="portal-info" style="display: <%= files.length > 0 ? "none" : "block" %>">
                                     <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                                     <span class="portal-descr">
                                         Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.
@@ -152,8 +154,6 @@
                                         </div>
                                     <% } %>
                                 </div>
-                                <% DocumentManager.Init(request, response); %>
-                                <% File[] files = DocumentManager.GetStoredFiles(null); %>
                                 <% if (files.length > 0)  { %>
                                     <div class="stored-list">
                                        <span class="header-list">Your documents</span>

web/documentserver-example/java/src/main/webapp/scripts/jscript.js

@@ -287,10 +287,6 @@ if (typeof jQuery !== "undefined") {
     };
 
     var fileList = jq("tr.tableRow");
-    if (fileList.length > 0) {
-        console.log(jq("div#portal-info").is(":visible"));
-        jq("div#portal-info").hide();
-    }
 
     var mouseIsOverTooltip = false;
     var hideTooltipTimeout = null;

web/documentserver-example/nodejs/public/javascripts/jscript.js

@@ -308,10 +308,6 @@ if (typeof jQuery != "undefined") {
     };
 
     var fileList = jq("tr.tableRow");
-    if (fileList.length > 0) {
-        console.log(jq("div#portal-info").is(":visible"));
-        jq("div#portal-info").hide();
-    }
 
     var mouseIsOverTooltip = false;
     var hideTooltipTimeout = null;

web/documentserver-example/nodejs/views/index.ejs

@@ -130,7 +130,7 @@
                     </td>
                     <td class="section">
                         <div class="main-panel">
-                            <div id="portal-info">
+                            <div id="portal-info" style="display: <%= storedFiles.length > 0 ? "none" : "block" %>">
                                 <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                                 <span class="portal-descr">
                                     Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.

web/documentserver-example/php/index.php

@@ -136,7 +136,13 @@
                             </td>
                             <td class="section">
                                 <div class="main-panel">
-                                    <div id="portal-info">
+                                    <?php
+                                    $storedFiles = getStoredFiles();
+                                    if (!empty($storedFiles)): ?>
+                                        <div id="portal-info" style="display: none">
+                                    <?php else: ?>
+                                        <div id="portal-info" style="display: block">
+                                    <?php endif; ?>
                                         <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                                         <span class="portal-descr">
                                             Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.
@@ -156,7 +162,6 @@
                                         } ?>"
                                     </div>
                                     <?php
-                                        $storedFiles = getStoredFiles();
                                         if (!empty($storedFiles)) { ?>
                                             <div class="stored-list">
                                                 <span class="header-list">Your documents</span>

web/documentserver-example/php/js/jscript.js

@@ -320,10 +320,6 @@ if (typeof jQuery != "undefined") {
     };
 
     var fileList = jq("tr.tableRow");
-    if (fileList.length > 0) {
-        console.log(jq("div#portal-info").is(":visible"));
-        jq("div#portal-info").hide();
-    }
 
     var mouseIsOverTooltip = false;
     var hideTooltipTimeout = null;

web/documentserver-example/python/static/js/jscript.js

@@ -294,10 +294,6 @@ if (typeof jQuery !== "undefined") {
     };
 
     var fileList = jq("tr.tableRow");
-    if (fileList.length > 0) {
-        console.log(jq("div#portal-info").is(":visible"));
-        jq("div#portal-info").hide();
-    }
 
     var mouseIsOverTooltip = false;
     var hideTooltipTimeout = null;

web/documentserver-example/python/templates/index.html

@@ -107,7 +107,11 @@
                     </td>
                     <td class="section">
                         <div class="main-panel">
-                        <div id="portal-info">
+                        {% if files %}
+                            <div id="portal-info" style="display: none">
+                        {% else %}
+                            <div id="portal-info" style="display: block">
+                        {% endif %}
                             <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                             <span class="portal-descr">
                                     Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.

web/documentserver-example/ruby/Gemfile.lock

@@ -99,12 +99,15 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.6.1)
     minitest (5.14.2)
     nio4r (2.5.4)
-    nokogiri (1.11.5-x64-mingw32)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.11.5-x86_64-linux)
+    nokogiri (1.12.5-x64-mingw32)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     racc (1.5.2)
     rack (2.2.3)

web/documentserver-example/ruby/app/assets/javascripts/jscript.js

@@ -286,10 +286,6 @@ if (typeof jQuery != "undefined") {
     };
 
     var fileList = jq("tr.tableRow");
-    if (fileList.length > 0) {
-        console.log(jq("div#portal-info").is(":visible"));
-        jq("div#portal-info").hide();
-    }
 
     var mouseIsOverTooltip = false;
     var hideTooltipTimeout = null;

web/documentserver-example/ruby/app/views/home/index.html.erb

@@ -109,8 +109,12 @@
           </div>
         </td>
         <td class="section">
+          <%
+            DocumentHelper.init(request.remote_ip, request.base_url)
+            docs = DocumentHelper.get_stored_files(nil)
+          %>
           <div class="main-panel">
-            <div id="portal-info">
+            <div id="portal-info" style="display: <%= docs.length > 0 ? "none" : "block" %>">
               <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
               <span class="portal-descr">
                 Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.
@@ -128,10 +132,7 @@
                 </div>
               <% end %>"
             </div>
-          <% 
-            DocumentHelper.init(request.remote_ip, request.base_url)
-            docs = DocumentHelper.get_stored_files(nil)
-            if docs.length > 0 %>
+          <% if docs.length > 0 %>
               <div class="stored-list">
                 <span class="header-list">Your documents</span>
                 <table class="tableHeader" cellspacing="0" cellpadding="0" width="100%">