Cleaning up content macro. Adding favicon. Fixing static content.

4 files changed, 11 insertions, 1 deletions

diff --git a/web/WEB-INF/restlet.xml b/web/WEB-INF/restlet.xml
index d77fb2e..67ee36d 100644
--- a/web/WEB-INF/restlet.xml
+++ b/web/WEB-INF/restlet.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0"?>
 <component xmlns="http://www.restlet.org/schemas/2.0/Component">
     <client protocol="FILE" />
-    <client protocols="HTTP HTTPS" />
+    <client protocol="HTTP" />
+    <client protocol="HTTPS" />
     <server protocols="HTTP HTTPS" />
  
     <defaultHost>
         <attach uripattern="/images" targetDescriptor="war:///images" />
         <attach uripattern="/scripts" targetDescriptor="war:///scripts" />
         <attach uripattern="/style.css" targetDescriptor="war:///style.css" />
+        <attach uripattern="/favicon.ico" targetDescriptor="war:///favicon.ico" />
         <attach uriPattern="" targetClass="com.p4square.grow.frontend.GrowFrontend" />
     </defaultHost>
 
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index be1e4cf..758b004 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -23,6 +23,10 @@
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>default</servlet-name>
+        <url-pattern>/favicon.ico</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
         <url-pattern>/images/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
diff --git a/web/images/about-grow.png b/web/images/about-grow.png
new file mode 100644
index 0000000..aaa25ec
--- /dev/null
+++ b/web/images/about-grow.png
diff --git a/web/style.css b/web/style.css
index 39d6756..b374150 100644
--- a/web/style.css
+++ b/web/style.css
@@ -96,6 +96,10 @@ nav.primary a.current {
     display: none;
 }
 
+#noticebox.visible {
+    display: block;
+}
+
 #noticebox img.icon {
     float: left;
     margin-right: 2em;