From bb0621fbdec4870a35e94e7b653508814e056adb Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Mon, 5 Jun 2006 12:07:31 +0000 Subject: [PATCH] [MRM-89] add sitemesh git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@411760 13f79535-47bb-0310-9956-ffa450edef68 --- maven-repository-webapp/pom.xml | 22 ++- .../src/main/webapp/WEB-INF/decorators.xml | 5 + .../webapp/WEB-INF/jsp/decorators/default.jsp | 108 ++++++++++ .../src/main/webapp/WEB-INF/jsp/form.jspf | 89 ++------- .../src/main/webapp/WEB-INF/web.xml | 16 +- .../src/main/webapp/css/maven-base.css | 184 ++++++++++++++++++ .../src/main/webapp/css/maven-theme.css | 164 ++++++++++++++++ .../src/main/webapp/css/print.css | 8 + .../src/main/webapp/css/site.css | 96 +++++++++ .../src/main/webapp/index.jsp | 1 + 10 files changed, 616 insertions(+), 77 deletions(-) create mode 100644 maven-repository-webapp/src/main/webapp/WEB-INF/decorators.xml create mode 100644 maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp create mode 100644 maven-repository-webapp/src/main/webapp/css/maven-base.css create mode 100644 maven-repository-webapp/src/main/webapp/css/maven-theme.css create mode 100644 maven-repository-webapp/src/main/webapp/css/print.css create mode 100644 maven-repository-webapp/src/main/webapp/css/site.css create mode 100644 maven-repository-webapp/src/main/webapp/index.jsp diff --git a/maven-repository-webapp/pom.xml b/maven-repository-webapp/pom.xml index a5f9fec64..a987c31a8 100644 --- a/maven-repository-webapp/pom.xml +++ b/maven-repository-webapp/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.maven.repository @@ -10,6 +10,17 @@ war Maven Repository Manager Web Application + + javax.servlet + servlet-api + 2.4 + provided + + + opensymphony + sitemesh + 2.2.1 + org.codehaus.plexus plexus-xwork-integration @@ -41,10 +52,15 @@ org.mortbay.jetty maven-jetty6-plugin - 6.0.0beta6 + 6.0.0beta11 - ${basedir}/target/${artifactId} 10 + + + 9000 + 60000 + + diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/decorators.xml b/maven-repository-webapp/src/main/webapp/WEB-INF/decorators.xml new file mode 100644 index 000000000..6838e8ed0 --- /dev/null +++ b/maven-repository-webapp/src/main/webapp/WEB-INF/decorators.xml @@ -0,0 +1,5 @@ + + + /* + + \ No newline at end of file diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp new file mode 100644 index 000000000..c4818db2d --- /dev/null +++ b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp @@ -0,0 +1,108 @@ +<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %> + + + <decorator:title default="Maven Repository Manager" /> + + + + + + + + + + + +
+ + +
+ +
+
+ +
+ +
+ +
+
+
+ + + + diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf index 93a134e5d..5a0d0eb6d 100644 --- a/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf +++ b/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf @@ -22,83 +22,34 @@ } -

Search by MD5 (select an artifact): +

Search by MD5 (select an artifact):

- - - + + +
- - - - - - - - - - - - - - - - - - - - - - - - -

-

Search: -

- - -
-

+

Search:

-

Search by Java Package: -

- - -
-

+
+ + +
+ +

Search by Java Package:

+ +
+ + +
diff --git a/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml b/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml index d795317d7..5a46febfc 100644 --- a/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml +++ b/maven-repository-webapp/src/main/webapp/WEB-INF/web.xml @@ -5,6 +5,16 @@ Maven Repository Manager + + sitemesh + com.opensymphony.module.sitemesh.filter.PageFilter + + + + sitemesh + /* + + org.codehaus.plexus.servlet.PlexusServletContextListener @@ -29,10 +39,6 @@ index.action + index.jsp - - - webwork - /WEB-INF/lib/webwork-2.1.7.jar - diff --git a/maven-repository-webapp/src/main/webapp/css/maven-base.css b/maven-repository-webapp/src/main/webapp/css/maven-base.css new file mode 100644 index 000000000..8adb0098b --- /dev/null +++ b/maven-repository-webapp/src/main/webapp/css/maven-base.css @@ -0,0 +1,184 @@ +body { + margin: 0px; + padding: 0px; +} + +img { + border: none; +} + +table { + padding: 0px; + width: 100%; + margin-left: -2px; + margin-right: -2px; +} + +acronym { + cursor: help; + border-bottom: 1px dotted #feb; +} + +table.bodyTable th, table.bodyTable td { + padding: 2px 4px 2px 4px; + vertical-align: top; +} + +div.clear { + clear: both; + visibility: hidden; +} + +div.clear hr { + display: none; +} + +#bannerLeft, #bannerRight { + font-size: xx-large; + font-weight: bold; +} + +#bannerLeft img, #bannerRight img { + margin: 0px; +} + +.xleft, #bannerLeft img { + float: left; + text-shadow: #7CFC00; +} + +.xright, #bannerRight img { + float: right; + text-shadow: #7CFC00; +} + +#banner { + padding: 0px; +} + +#banner img { + border: none; +} + +#breadcrumbs { + padding: 3px 10px 3px 10px; +} + +#leftColumn { + width: 170px; + float: left; + overflow: auto; +} + +#bodyColumn { + margin-right: 1.5em; + margin-left: 197px; +} + +#legend { + padding: 8px 0 8px 0; +} + +#navcolumn { + padding: 8px 4px 0 8px; +} + +#navcolumn h5 { + margin: 0; + padding: 0; + font-size: small; +} + +#navcolumn ul { + margin: 0; + padding: 0; + font-size: small; +} + +#navcolumn li { + list-style-type: none; + background-image: none; + background-repeat: no-repeat; + background-position: 0 0.4em; + padding-left: 16px; + list-style-position: outside; + line-height: 1.2em; + font-size: smaller; +} + +#navcolumn li.expanded { + background-image: url( ../images/expanded.gif ); +} + +#navcolumn li.collapsed { + background-image: url( ../images/collapsed.gif ); +} + +#poweredBy { + text-align: center; +} + +#navcolumn img { + margin-top: 10px; + margin-bottom: 3px; +} + +#poweredBy img { + display: block; + margin: 20px 0 20px 17px; + border: 1px solid black; + width: 90px; + height: 30px; +} + +#search img { + margin: 0px; + display: block; +} + +#search #q, #search #btnG { + border: 1px solid #999; + margin-bottom: 10px; +} + +#search form { + margin: 0px; +} + +#lastPublished { + font-size: x-small; +} + +.navSection { + margin-bottom: 2px; + padding: 8px; +} + +.navSectionHead { + font-weight: bold; + font-size: x-small; +} + +.section { + padding: 4px; +} + +#footer { + padding: 3px 10px 3px 10px; + font-size: x-small; +} + +#breadcrumbs { + font-size: x-small; + margin: 0pt; +} + +.source { + padding: 12px; + margin: 1em 7px 1em 7px; +} + +.source pre { + margin: 0px; + padding: 0px; +} diff --git a/maven-repository-webapp/src/main/webapp/css/maven-theme.css b/maven-repository-webapp/src/main/webapp/css/maven-theme.css new file mode 100644 index 000000000..886d4fc0f --- /dev/null +++ b/maven-repository-webapp/src/main/webapp/css/maven-theme.css @@ -0,0 +1,164 @@ +body { + padding: 0px 0px 10px 0px; +} + +body, td, select, input, li { + font-family: Verdana, Helvetica, Arial, sans-serif; + font-size: 13px; +} + +code { + font-family: Courier, monospace; + font-size: 13px; +} + +a { + text-decoration: none; +} + +a:link { + color: #36a; +} + +a:visited { + color: #47a; +} + +a:active, a:hover { + color: #69c; +} + +#legend li.externalLink { + background: url( ../images/external.png ) left top no-repeat; + padding-left: 18px; +} + +a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover { + background: url( ../images/external.png ) right center no-repeat; + padding-right: 18px; +} + +#legend li.newWindow { + background: url( ../images/newwindow.png ) left top no-repeat; + padding-left: 18px; +} + +a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover { + background: url( ../images/newwindow.png ) right center no-repeat; + padding-right: 18px; +} + +h2 { + padding: 4px 4px 4px 6px; + border: 1px solid #999; + color: #900; + background-color: #ddd; + font-weight: 900; + font-size: x-large; +} + +h3 { + padding: 4px 4px 4px 6px; + border: 1px solid #aaa; + color: #900; + background-color: #eee; + font-weight: normal; + font-size: large; +} + +h4 { + padding: 4px 4px 4px 6px; + border: 1px solid #bbb; + color: #900; + background-color: #fff; + font-weight: normal; + font-size: large; +} + +h5 { + padding: 4px 4px 4px 6px; + color: #900; + font-size: normal; +} + +p { + line-height: 1.3em; + font-size: small; +} + +#breadcrumbs { + border-top: 1px solid #aaa; + border-bottom: 1px solid #aaa; + background-color: #ccc; +} + +#leftColumn { + margin: 10px 0 0 5px; + border: 1px solid #999; + background-color: #eee; +} + +#navcolumn h5 { + font-size: smaller; + border-bottom: 1px solid #aaaaaa; + padding-top: 2px; + color: #000; +} + +table.bodyTable th { + color: white; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable th, table.bodyTable td { + font-size: 1em; +} + +table.bodyTable tr.a { + background-color: #ddd; +} + +table.bodyTable tr.b { + background-color: #eee; +} + +.source { + border: 1px solid #999; +} + +dl { + padding: 4px 4px 4px 6px; + border: 1px solid #aaa; + background-color: #ffc; +} + +dt { + color: #900; +} + +#organizationLogo img, #projectLogo img, #projectLogo span { + margin: 8px; +} + +#banner { + border-bottom: 1px solid #fff; +} + +.errormark, .warningmark, .donemark, .infomark { + background: url( ../images/icon_error_sml.gif ) no-repeat; +} + +.warningmark { + background-image: url( ../images/icon_warning_sml.gif ); +} + +.donemark { + background-image: url( ../images/icon_success_sml.gif ); +} + +.infomark { + background-image: url( ../images/icon_info_sml.gif ); +} + diff --git a/maven-repository-webapp/src/main/webapp/css/print.css b/maven-repository-webapp/src/main/webapp/css/print.css new file mode 100644 index 000000000..5695a5ac0 --- /dev/null +++ b/maven-repository-webapp/src/main/webapp/css/print.css @@ -0,0 +1,8 @@ +#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn { + display: none !important; +} + +#bodyColumn, body.docs div.docs { + margin: 0 !important; + border: none !important +} diff --git a/maven-repository-webapp/src/main/webapp/css/site.css b/maven-repository-webapp/src/main/webapp/css/site.css new file mode 100644 index 000000000..d13661b87 --- /dev/null +++ b/maven-repository-webapp/src/main/webapp/css/site.css @@ -0,0 +1,96 @@ +#sidebar { + float: right; + font-size: small; + margin: 10px; + padding: 10px; + border: 1px black solid; + width: 10em; +} + +#contentArea { + border: 1px solid black; + border-style: groove; + margin-right: 15em; + padding: 1em; +} + +#tabs b { + border: 1px solid black; + padding-left: 1em; + padding-right: 1em; +} + +#tabs a { + border: 1px solid black; + padding-left: 1em; + padding-right: 1em; + text-decoration: none; +} + +#tabArea { + border: 1px solid black; + padding: 1em; +} + +#searchBox p { + font-size: x-small; + text-align: center; + color: gray; +} + +#searchTypes { + text-align: right; + font-size: xx-small; +} + +#notes { + border: double blue; + margin-top: 20px; + margin-right: 15em; + padding: 5px; +} + +#notes p:first-child { + border-bottom: 1px solid blue; + font-weight: bold; + text-align: center; +} + +#feed { + float: right; +} + +.downloadButton { + background-color: green; + border: double white; + float: right; + padding: 5px; +} + +.downloadButton a { + font-size: large; + color: white; + font-weight: bold; + text-decoration: none; +} + +#labels { + background-color: #f2f2f2; + padding: 0.5em 1em 0.5em 1em; +} + +.statusOk { + color: green; + font-weight: bold; +} + +.statusFailed { + color: red; + font-weight: bold; +} + +.statusWarn { + color: orange; + font-weight: bold; +} + diff --git a/maven-repository-webapp/src/main/webapp/index.jsp b/maven-repository-webapp/src/main/webapp/index.jsp new file mode 100644 index 000000000..66a198330 --- /dev/null +++ b/maven-repository-webapp/src/main/webapp/index.jsp @@ -0,0 +1 @@ +<%response.sendRedirect( request.getContextPath() + "/index.action" );%> \ No newline at end of file