diff options
| -rw-r--r-- | app/views/layouts/default.rhtml | 11 | ||||
| -rw-r--r-- | app/views/user/index.rhtml | 7 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 14 |
3 files changed, 18 insertions, 14 deletions
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 038bdecef..242ae655a 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -6,11 +6,6 @@ <%= stylesheet_link_tag 'main' %> </head> <body> - <% 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 %> <div id="header"> <h1> <a href="/">GovernmentSpy</a> @@ -25,6 +20,12 @@ <!-- <li><a href="/about">About</a></li> --> </ul> + <% 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 %> diff --git a/app/views/user/index.rhtml b/app/views/user/index.rhtml index c4264cb81..3e2668d01 100644 --- a/app/views/user/index.rhtml +++ b/app/views/user/index.rhtml @@ -6,12 +6,15 @@ <% for display_user in @display_users %> <h1><%=@title%></h1> + <p class="subtitle">Joined on <%= simple_date(display_user.created_at) %></p> - <p>Registered on <%= simple_date(display_user.created_at) %></p> <p>Freedom of Information requests made by this person:</p> <ul> <% for info_request in display_user.info_requests %> - <li><%= link_to h(info_request.title), request_url(:id => info_request) %></li> + <li> + <%= link_to h(info_request.title), request_url(:id => info_request) %> + on <%= simple_date(info_request.created_at) %> + </li> <% end %> </ul> <% end %> diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 02c9f364d..5f0c63b2f 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -32,7 +32,7 @@ a:hover, a:active { #staging { text-align: center; - border-bottom: solid 2px #ff0000; + border-bottom: solid 1px #000000; background: #ffbbbb; } @@ -285,7 +285,7 @@ table#list_requests .odd { /* hack for IE5.5 */ * html .xsnazzy em {width:24px; height:12px; w\idth:0; hei\ght:0;} -.xsnazzy span {display:block; width:0; height:0; color:#fff; overflow:hidden; border-top:10px solid #7f7f9c; border-left:10px dotted transparent; border-right:10px dotted transparent; margin-left:52px; margin-top:-15px;} +.xsnazzy span {display:block; width:0; height:0; color:#fff; overflow:hidden; border-top:10px solid #7f7f7f; border-left:10px dotted transparent; border-right:10px dotted transparent; margin-left:52px; margin-top:-15px;} * html .xsnazzy span {width:20px; height:10px; w\idth:0; hei\ght:0;} .xb1, .xb2, .xb3, .xb4, .xb5, .xb6, .xb7 {display:block; overflow:hidden; font-size:0;} @@ -294,12 +294,12 @@ table#list_requests .odd { .xb1 {margin:0 8px; background:#fff;} .xb2 {margin:0 6px; background:#fff;} .xb3 {margin:0 4px; background:#fff;} -.xb4 {margin:0 3px; background:#7f7f9c; border-width:0 5px;} -.xb5 {margin:0 2px; background:#7f7f9c; border-width:0 4px;} -.xb6 {margin:0 2px; background:#7f7f9c; border-width:0 3px;} -.xb7 {margin:0 1px; background:#7f7f9c; border-width:0 3px; height:2px;} +.xb4 {margin:0 3px; background:#7f7f7f; border-width:0 5px;} +.xb5 {margin:0 2px; background:#7f7f7f; border-width:0 4px;} +.xb6 {margin:0 2px; background:#7f7f7f; border-width:0 3px;} +.xb7 {margin:0 1px; background:#7f7f7f; border-width:0 3px; height:2px;} -.xboxcontent {display:block; background:#7f7f9c; border:3px solid #fff; border-width:0 3px;} +.xboxcontent {display:block; background:#7f7f7f; border:3px solid #fff; border-width:0 3px;} .xspeaker { margin: -0.5em 52px; } |