Changeset 7760

Timestamp:

Nov 27, 2019, 2:37:26 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2199: Implement a "File viewer" extension point

Implemented in the file manger list and single-item pages.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/fileviewer/FileViewerUtil.java (modified) (3 diffs)
• src/clients/web/net/sf/basedb/clients/web/extensions/fileviewer/ViewAndDownloadActionFactory.java (modified) (2 diffs)
• www/common/datafiles/list_files.jsp (modified) (1 diff)
• www/filemanager/files/list_files.jsp (modified) (4 diffs)
• www/filemanager/files/view_file.jsp (modified) (3 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/fileviewer/FileViewerUtil.java

@@ -24 +24 @@
   private final FileViewerContext fileContext;
   private final ExtensionsInvoker<ButtonAction> fileActions;
+  private String prefix = "[";
+  private String suffix = "]";
   
   public FileViewerUtil(JspContext jspContext, FileViewerContext fileContext)
@@ -50 +52 @@
 
   /**
+    Sets a prefix and suffix string to use before and after the list of actions.
+    The default is "[" and "]".
+  */
+  public void setPrefixAndSuffix(String prefix, String suffix)
+  {
+    this.prefix = prefix;
+    this.suffix = suffix;
+  }
+  
+  /**
     Rended the extensions with the current file context information.
   */
@@ -68 +80 @@
     if (result != null && result.length() > 0)
     {
-      jspContext.getOut().write("<span class=\"file-actions\">[" + result + "]</span>");
+      jspContext.getOut().write("<span class=\"file-actions\">" + prefix + result + suffix + "</span>");
     }
   }

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/fileviewer/ViewAndDownloadActionFactory.java

@@ -3 +3 @@
 import net.sf.basedb.clients.web.extensions.AbstractJspActionFactory;
 import net.sf.basedb.clients.web.extensions.JspContext;
+import net.sf.basedb.clients.web.extensions.fileviewer.FileViewerContext.Type;
 import net.sf.basedb.clients.web.extensions.toolbar.ButtonAction;
 import net.sf.basedb.clients.web.extensions.toolbar.ButtonBean;
@@ -34 +35 @@
     if (l == Location.OFFLINE)
     {
-      ButtonBean offline = new ButtonBean();
-      offline.setVisible(true);
-      offline.setIcon(jspContext.getRoot()+"/images/offline.png");
-      offline.setTitle("This file is offline");
-      actions = new ButtonAction[] { offline };
+      if (fctx.getType() == Type.FILE)
+      {
+        // Here we add an "Upload" action
+        ButtonBean upload = new ButtonBean();
+        upload.setVisible(true);
+        upload.setClazz("link auto-init");
+        upload.setIcon(jspContext.getRoot()+"/images/upload.png");
+        upload.setTitle("Upload this file again");
+        upload.setDynamicAttribute("data-file-id", f.getId());
+        upload.setDynamicAttribute("data-auto-init", "upload-file");
+        actions = new ButtonAction[] { upload };
+      }
+      else
+      {
+        ButtonBean offline = new ButtonBean();
+        offline.setVisible(true);
+        offline.setIcon(jspContext.getRoot()+"/images/offline.png");
+        offline.setTitle("This file is offline");
+        actions = new ButtonAction[] { offline };
+      }
     }
     else if (l.isDownloadable())

trunk/www/common/datafiles/list_files.jsp

@@ -229 +229 @@
   <base:page type="include">
   <base:body>
-  <ext:scripts context="<%=jspContext%>" />
+    <ext:scripts context="<%=jspContext%>" />
     <base:section 
       id="datafiles" 

trunk/www/filemanager/files/list_files.jsp

@@ -72 +72 @@
   import="net.sf.basedb.clients.web.extensions.list.ListColumnAction"
   import="net.sf.basedb.clients.web.extensions.list.ListColumnUtil"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerUtil"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerContext"
   import="net.sf.basedb.util.extensions.ExtensionsInvoker"
   import="java.util.Iterator"
@@ -253 +255 @@
   ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
   ExtensionsInvoker<ListColumnAction<File,?>> columnsInvoker = ListColumnUtil.useExtensions(jspContext);
+  FileViewerContext fileContext = FileViewerContext.file();
+  FileViewerUtil fileViewer = new FileViewerUtil(jspContext, fileContext);
+  fileViewer.setPrefixAndSuffix("", "");
   %>
   <base:page title="<%=title==null ? "Files" : title%>" type="iframe" id="list-page">
@@ -837 +842 @@
             {
               File item = files.next();
+              fileContext.setCurrentFile(item);
               int itemId = item.getId();
               Location location = item.getLocation();
@@ -976 +982 @@
                 <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
                 <tbl:cell column="lastUpdate" value="<%=item.getLastUpdate()%>" />
-                <tbl:cell column="actions">
-                  <%
-                  if (location.isDownloadable())
-                  {
-                    %>
-                    <base:icon
-                      subclass="link auto-init"
-                      data-auto-init="view-file"
-                      data-file-id="<%=itemId %>"
-                      image="view.png" 
-                      tooltip="<%="View the contents of this file (" + fileSize + ")"%>" />
-                    <base:icon 
-                      subclass="link auto-init"
-                      data-auto-init="download-file"
-                      data-file-id="<%=itemId%>"
-                      image="download.png" 
-                      tooltip="<%="Download the contents of this file (" + fileSize + ")"%>" />
-                    <%
-                  }
-                  else if (location == Location.OFFLINE)
-                  {
-                    %>
-                    <base:icon 
-                      subclass="link auto-init"
-                      data-auto-init="upload-file"
-                      data-file-id="<%=itemId%>"
-                      image="upload.png" tooltip="Upload this file again"
-                    />
-                    <%
-                  }
-                  %>
-                </tbl:cell>
+                <tbl:cell column="actions"><%fileViewer.render();%></tbl:cell>
                 <tbl:cell column="permissions"><%=PermissionUtil.getShortPermissions(item)%></tbl:cell>
                 <tbl:cell column="sharedTo">

trunk/www/filemanager/files/view_file.jsp

@@ -54 +54 @@
   import="net.sf.basedb.clients.web.extensions.toolbar.ButtonAction" 
   import="net.sf.basedb.clients.web.extensions.toolbar.ToolbarUtil"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerUtil"
+  import="net.sf.basedb.clients.web.extensions.fileviewer.FileViewerContext"
   import="net.sf.basedb.util.extensions.ExtensionsInvoker"
   import="java.util.Collections"
@@ -103 +105 @@
   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, guiContext, file);
   ExtensionsInvoker<ButtonAction> invoker = ToolbarUtil.useExtensions(jspContext);
+  FileViewerContext fileContext = FileViewerContext.file();
+  fileContext.setCurrentFile(file);
+  FileViewerUtil fileViewer = new FileViewerUtil(jspContext, fileContext);
   %>
   <base:page type="iframe" title="<%=title%>" id="view-page">
@@ -254 +259 @@
       <tr>
         <th>Location</th>
-        <td><%=location%>       
+        <td><%=location%>
         <%
-        if (location.isDownloadable())
+        fileViewer.render();
+        if (location == Location.PRIMARY && file.hasPermission(Permission.WRITE) && !file.isWriteProtected())
         {
-          %>
-          [<base:icon 
-            subclass="link auto-init"
-            data-auto-init="view-file"
-            data-file-id="<%=itemId%>"
-            image="view.png" 
-            tooltip="<%="View the contents of this file (" + bytes + ")"%>" />
-          <base:icon 
-            subclass="link auto-init"
-            data-auto-init="download-file"
-            data-file-id="<%=itemId%>"
-            image="download.png" 
-            tooltip="<%="Download the contents of this file (" + bytes + ")"%>" />
-          <%
-          if (location == Location.PRIMARY && file.hasPermission(Permission.WRITE) && !file.isWriteProtected())
-          {
-            %>
-            | <span class="link" 
-              id="moveOffline"
-              data-file-id="<%=itemId %>"
-              data-location="OFFLINE"
-              >move offline</span>
-            | <span class="link auto-init"
-              data-auto-init="upload-file"
-              data-file-id="<%=itemId%>">replace</span>
-            <%
-          }
-          %>
-          ]
-          <%
-        }       
-        else if (location == Location.OFFLINE)
-        {
-          %>
-          [<base:icon 
-            subclass="link auto-init"
+          %> [<span class="link" 
+            id="moveOffline"
+            data-file-id="<%=itemId %>"
+            data-location="OFFLINE"
+            >move offline</span>
+          | <span class="link auto-init"
             data-auto-init="upload-file"
-            data-file-id="<%=itemId%>"
-            image="upload.png" tooltip="Upload this file again" />]
+            data-file-id="<%=itemId%>">replace</span>]
           <%
         }