support basic skinning (by providing file where CSS can be overridden)

6 files changed, 33 insertions, 5 deletions

diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index d49ec316a..97ee7bd51 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -24,6 +24,10 @@
         <!--[if LT IE 7]> 
         <style type="text/css">@import url("/stylesheets/ie6.css");</style> 
         <![endif]-->
+        <%= stylesheet_link_tag 'main-custom', :title => "Main", :rel => "stylesheet"  %>
+        <!--[if LT IE 7]> 
+        <style type="text/css">@import url("/stylesheets/ie6-custom.css");</style> 
+        <![endif]-->
 
         <% if @feed_autodetect %>
             <% for feed in @feed_autodetect %>
@@ -84,8 +88,8 @@
             <%= _('Make and explore Freedom of Information requests') %>
         </div>
     </div>
-	<div id="mysoclogo">
-		<a href="http://www.mysociety.org">a site by mysociety.org</a>
+	<div id="orglogo">
+	  <%= render :partial => 'general/orglink' %>
 	</div>
     <div id="navigation_search">
         <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %>
diff --git a/public/images/navimg/alaveteli-logo-header.png b/public/images/navimg/alaveteli-logo-header.png
new file mode 100644
index 000000000..49b529718
--- /dev/null
+++ b/public/images/navimg/alaveteli-logo-header.png
diff --git a/public/images/navimg/alaveteli-logo.png b/public/images/navimg/alaveteli-logo.png
new file mode 100644
index 000000000..ce9abdd3d
--- /dev/null
+++ b/public/images/navimg/alaveteli-logo.png
diff --git a/public/stylesheets/ie6-custom.css b/public/stylesheets/ie6-custom.css
new file mode 100644
index 000000000..ae02fe158
--- /dev/null
+++ b/public/stylesheets/ie6-custom.css
@@ -0,0 +1,6 @@
+/* drop your local IE-specific CSS overrides in here */
+
+#banner
+{
+	background-image: url(../images/navimg/alaveteli-100pxd.jpg); 
+}
diff --git a/public/stylesheets/main-custom.css b/public/stylesheets/main-custom.css
new file mode 100644
index 000000000..2f68de6b1
--- /dev/null
+++ b/public/stylesheets/main-custom.css
@@ -0,0 +1,18 @@
+/* drop your local CSS overrides in here */
+#banner
+{
+ // background-image: url(../images/navimg/somebanner.jpg); 
+}
+
+
+
+#header h1 a
+{ 
+    background-image: url(../images/navimg/alaveteli-logo.png);
+}
+
+
+#orglogo a 
+{
+    background-image: url(../images/navimg/alaveteli-logo-header.png);
+}
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 70910a535..cb422b53c 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -102,8 +102,8 @@ body
     text-align: center;
 }
 	
-/*------------------------------------------------ mysoc logo */
-	#mysoclogo
+/*------------------------------------------------ org logo */
+	#orglogo
 	{
 		position: absolute;
 		width: 100%;
@@ -115,7 +115,7 @@ body
 		height: 40px;
 		z-index: 100;
 	}
-		#mysoclogo a
+		#orglogo a
 		{
 			color: #f0f0f0;
 			display: block;