continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r239644 - in /maven/continuum/trunk/continuum-web/src/main: java/org/apache/maven/continuum/web/action/ resources/css/ resources/forms/ resources/images/ resources/localization/ resources/templates/layouts/ resources/templates/navigations/ ...
Date Wed, 24 Aug 2005 12:49:19 GMT
Author: evenisse
Date: Wed Aug 24 05:49:00 2005
New Revision: 239644

URL: http://svn.apache.org/viewcvs?rev=239644&view=rev
Log:
[CONTINUUM-279] Align template with white site
[CONTINUUM-297] Merge Add and upload maven project screens.

Added:
    maven/continuum/trunk/continuum-web/src/main/resources/images/continuum_logo_75.gif  
(with props)
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm
  (with props)
Removed:
    maven/continuum/trunk/continuum-web/src/main/resources/css/ns4_only.css
    maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenOneProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenTwoProject.xml
Modified:
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProject.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProject.java
    maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenOneProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenTwoProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Default.vm
    maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Index.vm
    maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm
    maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultBottom.vm
    maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm
    maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProject.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProject.java?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProject.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProject.java
Wed Aug 24 05:49:00 2005
@@ -21,7 +21,10 @@
 import org.codehaus.plexus.formica.Form;
 import org.codehaus.plexus.formica.action.AbstractEntityAction;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
 
+import java.net.URL;
 import java.util.Map;
 
 /**
@@ -37,11 +40,36 @@
     {
         Continuum continuum = (Continuum) container.lookup( Continuum.ROLE );
 
-        ContinuumProjectBuildingResult result = continuum.addMavenOneProject( (String) parameters.get(
"m1PomUrl" ) );
+        String m1PomUrl = (String) parameters.get( "m1PomUrl" );
 
-        if ( result.getWarnings().size() > 0 )
+        String m1PomFile = (String) parameters.get( "m1PomFile" );
+
+        String m1Pom = null;
+
+        if ( !StringUtils.isEmpty( m1PomUrl ) )
+        {
+            m1Pom = m1PomUrl;
+        }
+        else
+        {
+            URL url = new URL( m1PomFile );
+
+            String content = IOUtil.toString( url.openStream() );
+
+            if ( !StringUtils.isEmpty( content ) )
+            {
+                m1Pom = m1PomFile;
+            }
+        }
+
+        if ( !StringUtils.isEmpty( m1Pom ) )
         {
-            setResultMessages( result.getWarnings(), parameters );
+            ContinuumProjectBuildingResult result = continuum.addMavenOneProject( m1Pom );
+
+            if ( result.getWarnings().size() > 0 )
+            {
+                setResultMessages( result.getWarnings(), parameters );
+            }
         }
     }
 }

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProject.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProject.java?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProject.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProject.java
Wed Aug 24 05:49:00 2005
@@ -5,11 +5,15 @@
 import org.codehaus.plexus.formica.Form;
 import org.codehaus.plexus.formica.action.AbstractEntityAction;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
 
+import java.net.URL;
 import java.util.Map;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  */
 public class AddMavenTwoProject
@@ -21,11 +25,36 @@
     {
         Continuum continuum = (Continuum) container.lookup( Continuum.ROLE );
 
-        ContinuumProjectBuildingResult result = continuum.addMavenTwoProject( (String) parameters.get(
"m2PomUrl" ) );
+        String m2PomUrl = (String) parameters.get( "m2PomUrl" );
 
-        if ( result.getWarnings().size() > 0 )
+        String m2PomFile = (String) parameters.get( "m2PomFile" );
+
+        String m2Pom = null;
+
+        if ( !StringUtils.isEmpty( m2PomUrl ) )
+        {
+            m2Pom = m2PomUrl;
+        }
+        else
+        {
+            URL url = new URL( m2PomFile );
+
+            String content = IOUtil.toString( url.openStream() );
+
+            if ( !StringUtils.isEmpty( content ) )
+            {
+                m2Pom = m2PomFile;
+            }
+        }
+
+        if ( !StringUtils.isEmpty( m2Pom ) )
         {
-            setResultMessages( result.getWarnings(), parameters );
+            ContinuumProjectBuildingResult result = continuum.addMavenTwoProject( m2Pom );
+
+            if ( result.getWarnings().size() > 0 )
+            {
+                setResultMessages( result.getWarnings(), parameters );
+            }
         }
     }
 }

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenOneProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenOneProject.xml?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenOneProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenOneProject.xml Wed
Aug 24 05:49:00 2005
@@ -1,6 +1,9 @@
 <form>
   <id>addMavenOneProject</id>
   <source-role>org.apache.maven.continuum.Continuum</source-role>
+  <attributes>
+    <multipart>true</multipart>
+  </attributes>
   <elements>
     <!--
     TODO: we're going to have to move away from dotted properties because it confuses OGNL
i.e #project.foo
@@ -10,10 +13,6 @@
       <id>m1PomUrl</id>
       <validators>
         <validator>
-          <id>required</id>
-          <error-message-key>empty.error</error-message-key>
-        </validator>
-        <validator>
           <id>url</id>
           <error-message-key>url.error</error-message-key>
         </validator>
@@ -25,16 +24,23 @@
       <expression>scmUrl</expression>
       <type>text</type>
     </element>
+    <element>
+      <id>m1PomFile</id>
+      <validators>
+      </validators>
+      <expression>scmUrl</expression>
+      <type>upload</type>
+    </element>
   </elements>
 
   <!-- Add -->
   <add>
-    <title-key>project.title.add</title-key>
+    <title-key>project.title.m1.add</title-key>
     <action>addMavenOneProject</action>
     <view>Summary.vm</view>
-    <view-on-failure>Add.vm</view-on-failure>
+    <view-on-failure>AddMavenProject.vm</view-on-failure>
     <fid-on-failure>addMavenOneProject</fid-on-failure>    
-    <expression>addMavenOneProject(#m1PomUrl)</expression>
+    <expression>addMavenOneProject(#m1PomUrl, #m1PomFile)</expression>
   </add>
 
   <!-- Update -->

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenTwoProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenTwoProject.xml?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenTwoProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/addMavenTwoProject.xml Wed
Aug 24 05:49:00 2005
@@ -1,15 +1,14 @@
 <form>
   <id>addMavenTwoProject</id>
   <source-role>org.apache.maven.continuum.Continuum</source-role>
+  <attributes>
+    <multipart>true</multipart>
+  </attributes>
   <elements>
     <element>
       <id>m2PomUrl</id>
       <validators>
         <validator>
-          <id>required</id>
-          <error-message-key>empty.error</error-message-key>
-        </validator>
-        <validator>
           <id>url</id>
           <error-message-key>url.error</error-message-key>
         </validator>
@@ -20,21 +19,27 @@
       </validators>
       <type>text</type>
     </element>
+    <element>
+      <id>m2PomFile</id>
+      <validators>
+      </validators>
+      <type>upload</type>
+    </element>
   </elements>
 
   <!-- Add -->
   <add>
-    <title-key>project.title.add</title-key>
+    <title-key>project.title.m2.add</title-key>
     <action>addMavenTwoProject</action>
     <view>Summary.vm</view>
-    <view-on-failure>Add.vm</view-on-failure>
+    <view-on-failure>AddMavenProject.vm</view-on-failure>
     <fid-on-failure>addMavenTwoProject</fid-on-failure>
-    <expression>addMavenTwoProject(#m2PomUrl)</expression>
+    <expression>addMavenTwoProject(#m2PomUrl, #m2PomFile)</expression>
   </add>
 
   <!-- Update -->
   <update>
-    <title-key>project.title.update</title-key>
+    <title-key>project.title.m2.update</title-key>
     <action>updateEntity</action>
     <view>Summary.vm/fid/continuumProject</view>
     <view-on-failure>Edit.vm</view-on-failure>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml Wed Aug 24
05:49:00 2005
@@ -21,7 +21,7 @@
 
   <!-- Add -->
   <add>
-    <title-key>project.title.add</title-key>
+    <title-key>project.title.ant.add</title-key>
     <action>addEntity</action>
     <view>Summary.vm</view>
     <view-on-failure>Add.vm</view-on-failure>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml Wed
Aug 24 05:49:00 2005
@@ -17,26 +17,26 @@
       <expression>name</expression>
     </element>
     <element>
-      <id>projectScmUrl</id>
+      <id>project.version</id>
       <validators>
         <validator>
-          <id>scm-url</id>
-          <error-message-key>projectScmUrl.error</error-message-key>
+          <id>required</id>
+          <error-message-key>project.version.error</error-message-key>
         </validator>
       </validators>
       <type>text</type>
-      <expression>scmUrl</expression>
+      <expression>version</expression>
     </element>
     <element>
-      <id>project.version</id>
+      <id>projectScmUrl</id>
       <validators>
         <validator>
-          <id>required</id>
-          <error-message-key>project.version.error</error-message-key>
+          <id>scm-url</id>
+          <error-message-key>projectScmUrl.error</error-message-key>
         </validator>
       </validators>
       <type>text</type>
-      <expression>version</expression>
+      <expression>scmUrl</expression>
     </element>
     <element>
       <id>project.type</id>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml Wed Aug
24 05:49:00 2005
@@ -25,7 +25,7 @@
   </elements>
 
   <add>
-    <title-key>project.title.add</title-key>
+    <title-key>project.title.shell.add</title-key>
     <action>addEntity</action>
     <view>Summary.vm</view>
     <view-on-failure>Add.vm</view-on-failure>

Added: maven/continuum/trunk/continuum-web/src/main/resources/images/continuum_logo_75.gif
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/images/continuum_logo_75.gif?rev=239644&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/continuum/trunk/continuum-web/src/main/resources/images/continuum_logo_75.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
Wed Aug 24 05:49:00 2005
@@ -56,6 +56,11 @@
 m1PomUrl.label = M1 POM Url
 m1PomUrl.message = Enter the URL to the Maven 1 POM
 m1PomUrl.error = You must enter a valid URL
+m1PomFile.label = Upload POM
+m1PomFile.message =  Enter the local filename of the Maven 1 POM to upload
+m1PomFile.error = You must enter a valid URL
+
+project.title.m1.add = Add Maven 1.x Project
 
 project.goals.label = Goals
 project.goals.message = Enter the goals to execute (default: jar:install)
@@ -64,9 +69,14 @@
 // Maven 2
 // ----------------------------------------------------------------------
 
-m2PomUrl.label = M2 POM Url
-m2PomUrl.message = Enter the URL to the Maven 2 POM
+m2PomUrl.label = POM Url
+m2PomUrl.message =  Enter the URL to the Maven 2 POM
 m2PomUrl.error = You must enter a valid URL
+m2PomFile.label = Upload POM
+m2PomFile.message =  Enter the local filename of the Maven 2 POM to upload
+m2PomFile.error = You must enter a valid URL
+
+project.title.m2.add = Add Maven 2.0+ Project
 
 project.phase.label = Phase/Goals
 project.phase.message = Enter the phase or goals to execute (default: install)
@@ -75,6 +85,8 @@
 // Shell project
 // ----------------------------------------------------------------------
 
+project.title.m1.add = Add Shell Project
+
 project.arguments.label = Arguments
 project.arguments.message = Enter shell script arguments, if any
 project.arguments.error =
@@ -85,6 +97,8 @@
 // Ant Project
 // ----------------------------------------------------------------------
 
+project.title.m1.add = Add Ant Project
+
 project.targets.label = Targets
 project.targets.error = You must provide at least one target
 project.targets.message = Enter one or more targets (e.g. build,test)
@@ -108,6 +122,12 @@
 empty.error = This field is required
 url.error = You must provide a valid url
 urlSource.error = The URL you provided doesn't exist
+
+// ----------------------------------------------------------------------
+// General messages
+// ----------------------------------------------------------------------
+
+message.or = OR
 
 // ----------------------------------------------------------------------
 // Exceptions

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Default.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Default.vm?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Default.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Default.vm Wed
Aug 24 05:49:00 2005
@@ -3,54 +3,29 @@
 <html>
   <head>
     <title>$page.title</title>
-    <link rel="stylesheet" type="text/css" href="$data.getLink("css/tigris.css")" media="screen"/>
-    <link rel="stylesheet" type="text/css" href="$data.getLink("css/print.css")" media="print"/>
+    <link rel="stylesheet" type="text/css" href="$data.getLink("css/tigris.css")" media="screen"
/>
+    <link rel="stylesheet" type="text/css" href="$data.getLink("css/print.css")" media="print"
/>
 
-    <script type="text/javascript">
-  if (document.layers)
-  {
-    document.write(' <link rel="stylesheet" type="text/css" href="$data.getLink("css/ns4_only.css")"
media="screen"/>')
-  }
-    </script>
     <script src="$data.getLink("scripts/tigris.js")" type="text/javascript"></script>
   </head>
 
   <body onload="focus()" marginwidth="0" marginheight="0" class="composite">
 
-    <div id="banner">
-      <table border="1" cellspacing="0" cellpadding="8" width="100%">
-        <tr>
-          <td>
-            <a href="http://maven.apache.org/continuum">
-              <img src="$data.getLink("images/continuum_logo.png")" align="left" alt="Continuum"
border="0"/>
-            </a>
+    #parse("navigations/DefaultTop.vm")
+
+    <table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
+      <tbody>
+        <tr valign="top">
+          <td id="leftcol" width="30%">
+            #parse("navigations/Menu.vm")
           </td>
-          <td valign="middle" style="vertical-align: middle">
-            <a href="http://www.apache.org/">
-            </a>
+          <td>
+            <div id="bodycol">
+              $screenViewContent
+            </div>
           </td>
         </tr>
-      </table>
-    </div>
-
-    <div id="breadcrumbs">
-      <div align="right">
-        <a href="http://maven.apache.org/">Maven</a> |
-        <a href="http://www.apache.org/">Apache</a>
-      </div>
-    </div>
-
-    <table border="0" cellspacing="0" cellpadding="4" width="100%" id="main">
-      <tr valign="top">
-        <td id="leftcol" width="30%">
-          #parse("navigations/Menu.vm")
-        </td>
-        <td>
-          <div id="bodycol">
-            $screenViewContent
-          </div>
-        </td>
-      </tr>
+      </tbody>
     </table>
 
     #parse("navigations/DefaultBottom.vm")

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Index.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Index.vm?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Index.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Index.vm Wed
Aug 24 05:49:00 2005
@@ -1,62 +1,34 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
-<head>
-  <title>$page.title</title>
-  <link rel="stylesheet" type="text/css" href="$data.getLink("css/tigris.css")" media="screen"
/>
-  <link rel="stylesheet" type="text/css" href="$data.getLink("css/print.css")" media="print"
/>
-
-  <script type="text/javascript">
-  if (document.layers)
-  {
-    document.write('<link rel="stylesheet" type="text/css" href="$data.getLink("css/ns4_only.css")"
media="screen" />')
-  }
-  </script>
-  <script src="$data.getLink("scripts/tigris.js")" type="text/javascript"></script>
-</head>
-
-<body onload="focus()" marginwidth="0" marginheight="0" class="composite">
-
- <div id="banner">
-  <table border="1" cellspacing="0" cellpadding="8" width="100%">
-   <tr>
-    <td>
-      <a href="http://maven.apache.org/continuum">
-       <img src="$data.getLink("images/continuum_logo.png")" align="left" alt="Continuum"
border="0"/>
-      </a>
-    </td>
-    <td valign="middle" style="vertical-align: middle">
-      <a href="http://www.apache.org/">
-        <!--
-        <img src="$data.getLink("images/codehaus-small.png")" align="right" alt="Codehaus"
border="0" />
-        -->
-       </a>
-    </td>
-   </tr>
-  </table>
- </div>
-
- <div id="breadcrumbs">
-  <div align="right">
-    <a href="http://maven.apache.org/">Maven</a> |
-    <a href="http://www.apache.org/">Apache</a>
-  </div>
- </div>
-
- <table border="0" cellspacing="0" cellpadding="4" width="100%" id="main">
-  <tr valign="top">
-   <td id="leftcol" width="20%">
-    #parse("navigations/Menu.vm")
-   </td>
-   <td>
-    <div id="bodycol">
-      $screenViewContent
-     </div>
-    </td>
-  </tr>
- </table>
+  <head>
+    <title>$page.title</title>
+    <link rel="stylesheet" type="text/css" href="$data.getLink("css/tigris.css")" media="screen"
/>
+    <link rel="stylesheet" type="text/css" href="$data.getLink("css/print.css")" media="print"
/>
+
+    <script src="$data.getLink("scripts/tigris.js")" type="text/javascript"></script>
+  </head>
+
+  <body onload="focus()" marginwidth="0" marginheight="0" class="composite">
+
+    #parse("navigations/DefaultTop.vm")
+
+    <table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
+      <tbody>
+        <tr valign="top">
+          <td id="leftcol" width="20%">
+            #parse("navigations/Menu.vm")
+          </td>
+          <td>
+            <div id="bodycol">
+              $screenViewContent
+            </div>
+           </td>
+        </tr>
+      </tbody>
+   </table>
 
- #parse("navigations/DefaultBottom.vm")
+   #parse("navigations/DefaultBottom.vm")
 
-</body>
+  </body>
 </html>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm Wed
Aug 24 05:49:00 2005
@@ -3,50 +3,26 @@
 <html>
   <head>
     <title>$page.title</title>
-    <link rel="stylesheet" type="text/css" href="$data.getLink("css/tigris.css")" media="screen"/>
-    <link rel="stylesheet" type="text/css" href="$data.getLink("css/print.css")" media="print"/>
+    <link rel="stylesheet" type="text/css" href="$data.getLink("css/tigris.css")" media="screen"
/>
+    <link rel="stylesheet" type="text/css" href="$data.getLink("css/print.css")" media="print"
/>
 
-    <script type="text/javascript">
-    if (document.layers)
-    {
-      document.write('<link rel="stylesheet" type="text/css" href="$data.getLink("css/ns4_only.css")"
media="screen"/>')
-    }
-    </script>
     <script src="$data.getLink("scripts/tigris.js")" type="text/javascript"></script>
   </head>
 
   <body onload="focus()" marginwidth="0" marginheight="0" class="composite">
 
-    <div id="banner">
-      <table border="1" cellspacing="0" cellpadding="8" width="100%">
-        <tr>
+    #parse("navigations/DefaultTop.vm")
+
+    <table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
+      <tbody>
+        <tr valign="top">
           <td>
-            <a href="http://maven.apache.org/continuum">
-              <img src="$data.getLink("images/continuum_logo.png")" align="left" alt="Continuum"
border="0"/>
-            </a>
-          </td>
-          <td valign="middle" style="vertical-align: middle">
-            <a href="http://www.apache.org/"></a>
+            <div id="bodycol">
+              $screenViewContent
+            </div>
           </td>
         </tr>
-      </table>
-    </div>
-
-    <div id="breadcrumbs">
-      <div align="right">
-        <a href="http://maven.apache.org/">Maven</a> |
-        <a href="http://www.apache.org/">Apache</a>
-      </div>
-    </div>
-
-    <table border="0" cellspacing="0" cellpadding="4" width="100%" id="main">
-      <tr valign="top">
-        <td>
-          <div id="bodycol">
-      $screenViewContent
-          </div>
-        </td>
-      </tr>
+      </tbody>
     </table>
 
     #parse("navigations/DefaultBottom.vm")

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultBottom.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultBottom.vm?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultBottom.vm
(original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultBottom.vm
Wed Aug 24 05:49:00 2005
@@ -1,11 +1,9 @@
 <div id="footer">
-  <table border="0" cellspacing="0" cellpadding="4">
-    <tr>
+  <table border="0" cellpadding="4" cellspacing="0">
+    <tbody><tr>
       <td>
-        &copy; 2005
-        <a href="http://maven.apache.org/continuum">Continuum</a> |
-        <a href="http://maven.apache.org">Maven</a> |
+        Continuum &#169; 2005 Apache Software Foundation
       </td>
     </tr>
-  </table>
+    </tbody></table>
 </div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm
(original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/DefaultTop.vm
Wed Aug 24 05:49:00 2005
@@ -1,2 +1,30 @@
-Summit Test App
-<hr>
+<div id="banner">
+  <table border="1" cellspacing="0" cellpadding="8" width="100%">
+    <tbody>
+      <tr>
+        <td>
+          <a href="http://www.apache.org/">
+            Your company logo here
+          </a>
+        </td>
+        <td>
+          <a href="http://maven.apache.org/continuum">
+            <img src="$data.getLink("images/continuum_logo_75.gif")" alt="Continuum" align="right"
border="0">
+          </a>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<div id="breadcrumbs">
+  <div style="float: right">
+    <a href="http://maven.apache.org/continuum">Continuum</a> |
+    <a href="http://maven.apache.org/">Maven</a> |
+    <a href="http://www.apache.org/">Apache</a>
+  </div>
+
+  <div>
+    Welcome, <b>Guest</b>
+  </div>
+</div>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm?rev=239644&r1=239643&r2=239644&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm Wed
Aug 24 05:49:00 2005
@@ -1,6 +1,7 @@
 <div id="navcolum">
-  <div id="projecttools" class="toolgroup">
+  <div id="projectmenu" class="toolgroup">
     <div class="label">Continuum</div>
+
     <div class="body">
       <div>
         <a href="$link.setPage('Summary.vm').addPathInfo( 'fid', 'continuumProject')">Show
Projects</a>
@@ -10,24 +11,19 @@
 
   <div id="projecttools" class="toolgroup">
     <div class="label">Add Project</div>
+
     <div class="body">
       <div>
-        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'addMavenTwoProject')">Add
M2 Project</a>
-      </div>
-      <div>
-        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'uploadMavenTwoProject')">Upload
M2 Project</a>
-      </div>
-      <div>
-        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'addMavenOneProject')">Add
M1 Project</a>
+        <a href="$link.setPage('AddMavenProject.vm').addPathInfo( 'fid', 'addMavenTwoProject')">Maven
2.0+ Project</a>
       </div>
       <div>
-        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'uploadMavenOneProject')">Upload
M1 Project</a>
+        <a href="$link.setPage('AddMavenProject.vm').addPathInfo( 'fid', 'addMavenOneProject')">Maven
1.x Project</a>
       </div>
       <div>
-        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'antProject')">Add Ant
Project</a>
+        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'antProject')">Ant Project</a>
       </div>
       <div>
-        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'shellProject')">Add Shell
Project</a>
+        <a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'shellProject')">Shell
Project</a>
       </div>
     </div>
   </div>

Added: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm?rev=239644&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm
(added)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm
Wed Aug 24 05:49:00 2005
@@ -0,0 +1,32 @@
+$page.setTitle( "Add Project" )
+
+<div class="app">
+  <div id="axial" class="h3">
+    <h3>$i18n.getString( $form.add.titleKey )</h3>
+    <form method="post" action="$link" #if( $form.attributes.multipart )enctype="multipart/form-data"#end>
+      #hidden ( "fid" $form.id )
+      #hidden ( "action" $form.add.action )
+      #hidden ( "view" $form.add.view )
+      #hidden ( "id" $id )
+
+      <div class="axial">
+        <table border="1" cellspacing="2" cellpadding="3" width="100%">
+          <tr>
+            #field( $i18n $data $form.elements.get(0) $item $formtool )
+          </tr>
+          <tr>
+            <td>&nbsp;</td>
+            <td>
+              <strong>$i18n.getString( "message.or" )</strong>
+            </td>
+          </tr>
+          <tr>
+            #field( $i18n $data $form.elements.get(1) $item $formtool )
+          </tr>
+        </table>
+
+        #submitBar( "Submit" )
+      </div>
+    </form>
+  </div>
+</div>

Propchange: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddMavenProject.vm
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"



Mime
View raw message