diff options
| -rw-r--r-- | app/views/layouts/default.rhtml | 45 | ||||
| -rw-r--r-- | public/images/navimg/bnnr-ifyoudontask-24bit.png | bin | 0 -> 145459 bytes | |||
| -rw-r--r-- | public/images/navimg/bnnr-ifyoudontask.png | bin | 0 -> 55741 bytes | |||
| -rw-r--r-- | public/images/navimg/infobug20px.png | bin | 0 -> 998 bytes | |||
| -rw-r--r-- | public/images/navimg/logo-trans.png | bin | 0 -> 4763 bytes | |||
| -rw-r--r-- | public/images/navimg/sidebag-bg-wide.png | bin | 0 -> 7645 bytes | |||
| -rw-r--r-- | public/images/navimg/sidebag-bg.png | bin | 0 -> 7465 bytes | |||
| -rw-r--r-- | public/stylesheets/alt.css | 232 |
8 files changed, 257 insertions, 20 deletions
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 9d9044339..d66a4539c 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -11,8 +11,11 @@ <% end %> </title> <%= stylesheet_link_tag 'main' %> + <%= stylesheet_link_tag 'alt', :rel => "alternate stylesheet", :title => "Tommy1" %> </head> <body> + <div id="banner"> + </div> <div id="header"> <h1> <a href="/">WhatDoTheyKnow?</a> @@ -22,15 +25,6 @@ Lift the lid on the UK public sector! </div> </div> - <ul id="navigation"> - <li><a href="/">Make request</a></li> - <li><%= link_to "View requests", request_list_url %></li> - <li><%= link_to "View authorities", list_public_bodies_url(:tag => 'department') %></li> - <% if @user %> - <li><%=link_to "My requests", user_url(@user) %></li> - <% end %> - <li><%= link_to "About", about_url %></li> - </ul> <div id="navigation_search"> <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %> <p> @@ -39,23 +33,34 @@ </p> <% end %> </div> - + <div id="topnav"> + <ul id="navigation"> + <li><a href="/">Make request</a></li> + <li><%= link_to "View requests", request_list_url %></li> + <li><%= link_to "View authorities", list_public_bodies_url(:tag => 'department') %></li> + <% if @user %> + <li><%=link_to "My requests", user_url(@user) %></li> + <% end %> + <li><%= link_to "About", about_url %></li> + </ul> + <% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %> + <div id="logged_in_bar"> + <% if @user %> + Hello, <%=h(@user.name)%>! + (<%= link_to "Sign out", signout_url(:r => request.request_uri) %>) + <% else %> + Hello! (<%= link_to "Sign in or sign up", signin_url(:r => request.request_uri) %>) + <% end %> + </div> + <% end %> + </div> + <% if MySociety::Config.getbool("STAGING_SITE", 1) %> <div id="staging"> This is a test version of the site. FOI requests will not be sent to real public bodies. </div> <% end %> - <% if not (controller.action_name == 'signin' or controller.action_name == 'signup') %> - <div id="logged_in_bar"> - <% if @user %> - Hello, <%=h(@user.name)%>! - (<%= link_to "Sign out", signout_url(:r => request.request_uri) %>) - <% else %> - Hello! (<%= link_to "Sign in or sign up", signin_url(:r => request.request_uri) %>) - <% end %> - </div> - <% end %> <div id="wrapper"> <div id="content"> diff --git a/public/images/navimg/bnnr-ifyoudontask-24bit.png b/public/images/navimg/bnnr-ifyoudontask-24bit.png Binary files differnew file mode 100644 index 000000000..5c87bdab4 --- /dev/null +++ b/public/images/navimg/bnnr-ifyoudontask-24bit.png diff --git a/public/images/navimg/bnnr-ifyoudontask.png b/public/images/navimg/bnnr-ifyoudontask.png Binary files differnew file mode 100644 index 000000000..f577778e1 --- /dev/null +++ b/public/images/navimg/bnnr-ifyoudontask.png diff --git a/public/images/navimg/infobug20px.png b/public/images/navimg/infobug20px.png Binary files differnew file mode 100644 index 000000000..f9cc70694 --- /dev/null +++ b/public/images/navimg/infobug20px.png diff --git a/public/images/navimg/logo-trans.png b/public/images/navimg/logo-trans.png Binary files differnew file mode 100644 index 000000000..917bec8b0 --- /dev/null +++ b/public/images/navimg/logo-trans.png diff --git a/public/images/navimg/sidebag-bg-wide.png b/public/images/navimg/sidebag-bg-wide.png Binary files differnew file mode 100644 index 000000000..6c7a10ec1 --- /dev/null +++ b/public/images/navimg/sidebag-bg-wide.png diff --git a/public/images/navimg/sidebag-bg.png b/public/images/navimg/sidebag-bg.png Binary files differnew file mode 100644 index 000000000..b76882610 --- /dev/null +++ b/public/images/navimg/sidebag-bg.png diff --git a/public/stylesheets/alt.css b/public/stylesheets/alt.css new file mode 100644 index 000000000..bf6ba2d16 --- /dev/null +++ b/public/stylesheets/alt.css @@ -0,0 +1,232 @@ +/*------------------------------------------------ global */ +body +{ + padding: 0px; + margin: 0px; + text-align: center; + font-family: Tahoma, Geneva, sans-serif; +} + +/*------------------------------------------------ banner */ + +#banner +{ + position: relative; + top: 0px; + left: 0px; + width: 100%; + height: 200px; + margin: 0px; + background-color: #F0F0F0; + background-image: url(../images/navimg/bnnr-ifyoudontask.png); + background-repeat: no-repeat; + background-position: center top; + border-color: #993233; + border-width: 0 0 3px 0; + border-style: solid; +} + +/*------------------------------------------------ header; not needed? */ +#header +{ display: none; } + +/*------------------------------------------------ search */ + +#navigation_search +{ + position: absolute; + width: 100%; + left: 0px; + top: 175px; + z-index: 150; + text-align: right; + -moz-opacity: 0.7!important; + filter: alpha(opacity= 70)!important; + opacity: 0.7!important; +} + #navigation_search input + { + border-color: #010101; + border-width: 1px; + border-style: solid; + background-color: #fff; + color: #000; + } + #navigation_search input#navigation_search_query + { + width: 8em; + } + +#navigation_search p { margin: 0 0.6em 0 0; } + +/*------------------------------------------------ topnav */ +#topnav +{ + position: relative; + top: 0px; + left: 0px; + width: 100%; + height: auto; + overflow: auto; + padding: 0px 0px 0px 0px; + z-index: 100; + background-color: #000; + font-size: 0.9em; +} + + #topnav ul + { + list-style: none; + margin: 0px; + padding: 0px; + } + + #topnav li + { + float: left; + } + + #topnav li a, #topnav li a:visited + { + display: block; + margin: 0px; + padding: 0.15em 0.6em 0.25em 0.8em; + color: #ADADAD; + text-decoration: none; + } + + #topnav li a:hover + { color: #fff; } + + #topnav li a:active { } + + #topnav li a.on, #topnav li a.on:visited + { + font-weight: bold; + color: #000; + } + + #topnav li a.on:hover {} + + #topnav li a.on:active {} + +/*-------------------------- login/signup */ +#logged_in_bar +{ + float: right; + clear: none; + font-size: 0.9em; + z-index: 200; + padding: 0.20em 10px 0.25em 1em; + color: #FFF; +} + #logged_in_bar a, #logged_in_bar a:visited { color: #92B3FF; } + +/*------------------------------------------------ temp stuff */ +#staging, #alpha_notice +{ display: none;} + +#staging +{ + border-color: #FF201D; + border-width: 1px; + border-style: dotted; + clear: both; + text-align: center; + color: #FF201D; + margin-top: 40px; +} + +#alpha_notice +{ + padding: 0 20px 0 20px; + border-color: #FF201D; + border-width: 1px; + border-style: dotted; + background-color: #f0f0f0; +} + +/*------------------------------------------------ wrapper*/ + +#wrapper +{ + position: relative; + clear: both; + top: 0em; + padding: 0px; + margin: 0px auto 1.2em auto; + max-width: 50em; + /* = 800px at default size? so 1em = 16px*/ + _width: 50em; + text-align: left; +} + +/*------------------------------------------------ content */ + +#content +{ + position: relative; + padding: 2em 1em 1em 1em; +} + +h1, h2, h3 +{ + font-family: Trebuchet, Trebuchet MS, Helvetica, sans-serif; + /*Arial Black, Gadget, sans-serif*/ + font-weight: bold; + line-height: 1em; + letter-spacing: 0em; + color: #555; +} + h1 { font-size: 1.8em;} + h2 { font-size: 1.4em;} + h3 { font-size: 1em;} + +h4, h5, h6 +{} + + +/*---------------- content : recent requests sidebar */ +#find_information +{ + width: 10.5em; + float: right; + clear: none; + background-color: #e0e0e0; + background-image: url(../images/navimg/sidebag-bg-wide.png); + background-repeat: no-repeat; + background-position: center top; + padding: 105px 0.25em 0.25em 0.35em; +} + #find_information h1 + { font-size: 1.2em; line-height: 0.85em; margin-top: 0px;} + + #find_information p + { font-size: 0.8em; line-height: 1em; } + + #find_information input#query + { width: 12em; } + +/*---------------- content : find body */ +#make_requests +{ + float: left; + clear: none; + width: 34em; + text-align: center; +} + +/*------------------------------------------------ footer */ + +#footer +{ + clear: both; + position: relative; + background-color: #F0F0F0; + border-color: #993233; + border-width: 3px 0 0 0; + border-style: solid; + margin: 1em 0 0 0; + padding: 0.5em 0 0.5em 0; + font-size: 0.85em; +}
\ No newline at end of file |
