Author: assaf
Date: Fri Jun 6 20:26:52 2008
New Revision: 664262
URL: http://svn.apache.org/viewvc?rev=664262&view=rev
Log:
Nicer background for header, and added non-functional search bar.
Added:
ode/sandbox/singleshot/public/images/header-bg.png
ode/sandbox/singleshot/public/images/magnifier.png
Modified:
ode/sandbox/singleshot/app/views/layouts/application.html.erb
ode/sandbox/singleshot/public/stylesheets/default.css
Modified: ode/sandbox/singleshot/app/views/layouts/application.html.erb
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/app/views/layouts/application.html.erb?rev=664262&r1=664261&r2=664262&view=diff
==============================================================================
--- ode/sandbox/singleshot/app/views/layouts/application.html.erb (original)
+++ ode/sandbox/singleshot/app/views/layouts/application.html.erb Fri Jun 6
20:26:52 2008
@@ -11,7 +11,10 @@
<body>
<div id='header'>
<h1><%= link_to 'Singleshot', root_url %></h1>
- <ul class='links'><li><%= link_to 'Logout', session_url,
:method=>:delete %></li></ul>
+ <ul class='links'>
+ <li><%= link_to 'Logout', session_url, :method=>:delete %></li>
+ <li><form action='<% tasks_url %>' method='get' class='search'><input
type='text' name='query' /><button><%= image_tag 'magnifier.png'
%></button></form></li>
+ </ul>
<ul class='tabs'><%=
[ ['â Tasks', tasks_url, 'Pending and available tasks'],
['Following', following_tasks_url, 'Tasks you create, observing or
administrating'],
@@ -19,7 +22,7 @@
['Activity', activity_url, 'Recent task activity'] ].map { |tab|
content_tag 'li', link_to(tab[0], tab[1], :title=>tab[2],
:class=>current_page?(tab[1]) ? 'current': nil)
}.join %></ul>
- <ul class='alternate'><%= content_tag 'li',
link_to(image_tag('feed.png') + ' Feed', @alternate[Mime::ATOM],
:rel=>'alternate', :title=>'Subscribe with your feed reader') if @alternate &&
@alternate[Mime::ATOM] %><%= content_tag 'li',
link_to(image_tag('calendar.png') + ' Calendar', @alternate[Mime::ICS],
:rel=>'alternate', :title=>'Add to your calendar') if @alternate &&
@alternate[Mime::ICS] %></ul>
+ <ul class='alternate'><%= content_tag 'li',
link_to(image_tag('feed.png') + ' Feed', @alternate[Mime::ATOM],
:rel=>'alternate', :title=>'Subscribe with your feed reader') if @alternate &&
@alternate[Mime::ATOM] %><%= content_tag 'li',
link_to(image_tag('calendar.png') + ' Calendar', @alternate[Mime::ICS],
:rel=>'alternate', :title=>'Add to your calendar') if @alternate &&
@alternate[Mime::ICS] %></ul>
</div>
<div id='main'>
<%= yield %>
Added: ode/sandbox/singleshot/public/images/header-bg.png
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/images/header-bg.png?rev=664262&view=auto
==============================================================================
Files ode/sandbox/singleshot/public/images/header-bg.png (added) and
ode/sandbox/singleshot/public/images/header-bg.png Fri Jun 6 20:26:52 2008
differ
Added: ode/sandbox/singleshot/public/images/magnifier.png
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/images/magnifier.png?rev=664262&view=auto
==============================================================================
Files ode/sandbox/singleshot/public/images/magnifier.png (added) and
ode/sandbox/singleshot/public/images/magnifier.png Fri Jun 6 20:26:52 2008
differ
Modified: ode/sandbox/singleshot/public/stylesheets/default.css
URL:
http://svn.apache.org/viewvc/ode/sandbox/singleshot/public/stylesheets/default.css?rev=664262&r1=664261&r2=664262&view=diff
==============================================================================
--- ode/sandbox/singleshot/public/stylesheets/default.css (original)
+++ ode/sandbox/singleshot/public/stylesheets/default.css Fri Jun 6 20:26:52
2008
@@ -84,6 +84,30 @@
margin: 0.3em 0 1em 0;
}
+form.search {
+ display: inline;
+ margin: 0 -1.2em 0 1em;
+}
+form.search input {
+ width: 15em;
+ padding-right: 2.5em;
+ border: 1px solid #ccc;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+}
+form.search input:focus, form.search input:hover {
+ border: 1px solid #ccc;
+}
+form.search button {
+ display: inline;
+ background: transparent;
+ left: -1.5em;
+ padding: 0;
+ margin: 0;
+ position: relative;
+ vertical-align: middle;
+}
+
fieldset {
border: 2pt solid #ccc;
padding: 1em;
@@ -104,9 +128,9 @@
/** Header **/
#header {
- background-color: #e8e8e8;
+ background: #c9c9c9 url('/images/header-bg.png') repeat-x bottom;
padding: 0.5em 3em 3px 3em;
- border-bottom: solid 2px #055da4;
+ border-bottom: solid 2px #898989;
}
#header h1 {
font-size: 2.0em;
@@ -288,8 +312,8 @@
width: 100%;
margin: 0;
padding: 0;
- background-color: #e8e8e8;
- border-bottom: solid 2px #055da4;
+ background: #c9c9c9 url('/images/header-bg.png') repeat-x bottom;
+ border-bottom: solid 2px #898989;
}
div.task div.header h1 {
font-size: 2.0em;
@@ -329,9 +353,7 @@
div.task div.details {
clear: both;
padding: 1em 3em 2em 3em;
- border-top: 1px solid #ccc;
margin: 0;
- background-color: #e8e8e8;
}
div.task div.details dt {
font-weight: bold;
@@ -367,23 +389,6 @@
background: #fff;
}
-div.task div.footer {
- position: fixed;
- bottom: 0;
- width: 100%;
- margin: 0;
- padding: 0.3em 3em 0.3em 3em;
- background-color: #e8e8e8;
- border-top: solid 2px #055da4;
-}
-div.task div.footer .actions {
- margin-right: 3em;
- padding-right: 3em;
- text-align: right;
-}
-div.task div.footer .actions .button-to {
- margin-left: 1em;
-}
/** Footer **/
