• improved the introduction screen
  • added links for most often used features
  • added initial libraries for jfreechart

nunobrito 2014-01-17

added /tool/lib/jfreechart/jcommon-1.0.21.jar
added /tool/run/products/Misc/jfreechart-1.0.17.tar.gz.spdx
added /tool/run/plugins/basic/triplecheck-logo.png
added /tool/run/plugins/basic/logo.png
added /tool/run/products/Misc/reg.spdx
added /tool/lib/jfreechart/jfreechart-1.0.17.jar
changed /tool/src/main/controller.java
changed /tool/run/plugins/webserver/server.java
changed /tool/run/settings.java
changed /tool/nbproject/project.properties
changed /tool/run/plugins/webserver/temp.html
changed /tool/run/plugins/spdx/show.java
copied /tool/run/plugins/basic/frontPage.java -> /tool/run/plugins/basic/home.java
/tool/lib/jfreechart/jcommon-1.0.21.jar Diff Switch to side-by-side view
Loading...
/tool/run/products/Misc/jfreechart-1.0.17.tar.gz.spdx Diff Switch to side-by-side view
Loading...
/tool/run/plugins/basic/triplecheck-logo.png Diff Switch to side-by-side view
Loading...
/tool/run/plugins/basic/logo.png Diff Switch to side-by-side view
Loading...
/tool/run/products/Misc/reg.spdx Diff Switch to side-by-side view
Loading...
/tool/lib/jfreechart/jfreechart-1.0.17.jar Diff Switch to side-by-side view
Loading...
/tool/src/main/controller.java Diff Switch to side-by-side view
Loading...
/tool/run/plugins/webserver/server.java Diff Switch to side-by-side view
Loading...
/tool/run/settings.java Diff Switch to side-by-side view
Loading...
/tool/nbproject/project.properties Diff Switch to side-by-side view
Loading...
/tool/run/plugins/webserver/temp.html Diff Switch to side-by-side view
Loading...
/tool/run/plugins/spdx/show.java Diff Switch to side-by-side view
Loading...
/tool/run/plugins/basic/frontPage.java to /tool/run/plugins/basic/home.java
--- a/tool/run/plugins/basic/frontPage.java
+++ b/tool/run/plugins/basic/home.java
@@ -19,6 +19,7 @@
 import script.log;
 import utils.html;
 import www.RequestOrigin;
+import www.Table;
 import www.WebRequest;
 
 
@@ -27,7 +28,7 @@
  *
  * @author Nuno Brito, 21st of December 2013 in Darsmtadt, Germany
  */
-public class frontPage extends Plugin{
+public class home extends Plugin{
 
     @Override
     public void startup(){
@@ -54,27 +55,35 @@
      */
     @Override
     public void main(WebRequest request){
-//        doScreen();
-//        // our answer from doScreen is saved to "output"
-//        request.setAnswer(output);
-//    }
-//    
-//    
-//    /**
-//     * Do the front screen that is displayed to users on startup
-//     */
-//    void doScreen() {
         
-        String navigation = ""
-                //+ html.br
-                + html.h2("Actions")
-                + html.link("Create a new SPDX", "/spdx/create.java?x=main")
-                + html.br
+        String navigationMain = ""
+//                + html.h2("Actions")
+                + html.div()
+                + html.link("Create new SPDX", "/spdx/create.java?x=main")
+//                + html.br
                 + html.br
                 + html.link("View SPDX files", "/spdx/show.java?x=main")
+                + html._div
+//                + html.br
+//                + html.br
+//                + html.br
+                + "";
+        
+                String navigationSub = ""
+//                + html.h2("Actions")
                 + html.br
-                + html.br
-                + html.br
+                //+ html.br        
+                + html.div()
+                + "Other actions: "        
+                + html.link("Log", "/basic/ToolsLog.java?x=showPage")
+                + html.divider
+                + html.link("Status", "/basic/status")
+                + html.divider
+                + html.link("Server", "/webserver/server")
+                + html._div
+//                + html.br
+//                + html.br
+//                + html.br
                 + "";
         
         
@@ -82,9 +91,9 @@
         String timeLine = www.twitter.getTimeLine("@triplechecked");
         
         String newsLine =  
-                html.h2("Share your open source news "
+                html.h3("Share your open source news "
                         + html.link("@triplechecked", "http://twitter.com/triplechecked")
-                        + "!") 
+                        + "") 
                 + timeLine;
         
         // did we got anything from the web?
@@ -96,13 +105,28 @@
             //return;
         }
         
+        String[] params = new String[]{
+            html.getIcon("logo.png", request)
+                , navigationMain
+        };
+        
+        int[] size = new int[]{40, 200};
+        
         String result = ""
                 + html.div()
-                + navigation
+                + html.br
+                + Table.alignedTable(params, size)
+                //+ navigation
+                + navigationSub
+                + html.br
+                + html.br
                 + newsLine
+                
                 + html._div
                 ;
         
         request.setAnswer(result);
     }
 }
+
+