diff options
| author | Luc Donnet | 2012-03-20 11:57:13 +0100 |
|---|---|---|
| committer | Luc Donnet | 2012-03-20 11:57:13 +0100 |
| commit | 0742e3c5f66c7e395ad0c02e1d659ed30338b204 (patch) | |
| tree | 0d8573bbd21452f8eeb05d3f119b05778247d35d | |
| parent | 153c6f7022a608c6780b265d3b91c95829b192e4 (diff) | |
| download | chouette-core-0742e3c5f66c7e395ad0c02e1d659ed30338b204.tar.bz2 | |
Integrate cityway work for IHM
| -rw-r--r-- | app/assets/images/header.png | bin | 0 -> 23490 bytes | |||
| -rw-r--r-- | app/assets/images/logoCertu.gif | bin | 0 -> 2163 bytes | |||
| -rw-r--r-- | app/assets/images/logoMedad.gif | bin | 0 -> 1568 bytes | |||
| -rw-r--r-- | app/assets/images/logoPredim.gif | bin | 0 -> 2915 bytes | |||
| -rw-r--r-- | app/assets/images/logo_chouette.png | bin | 0 -> 8860 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/application.css | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/layout.css.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/pagination.css.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/referentials.css.scss | 10 | ||||
| -rw-r--r-- | app/views/layouts/_logos.erb | 5 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 16 | ||||
| -rw-r--r-- | app/views/referentials/index.html.erb | 2 |
12 files changed, 41 insertions, 11 deletions
diff --git a/app/assets/images/header.png b/app/assets/images/header.png Binary files differnew file mode 100644 index 000000000..f00fc70c6 --- /dev/null +++ b/app/assets/images/header.png diff --git a/app/assets/images/logoCertu.gif b/app/assets/images/logoCertu.gif Binary files differnew file mode 100644 index 000000000..793f935a5 --- /dev/null +++ b/app/assets/images/logoCertu.gif diff --git a/app/assets/images/logoMedad.gif b/app/assets/images/logoMedad.gif Binary files differnew file mode 100644 index 000000000..b07fdce5f --- /dev/null +++ b/app/assets/images/logoMedad.gif diff --git a/app/assets/images/logoPredim.gif b/app/assets/images/logoPredim.gif Binary files differnew file mode 100644 index 000000000..22e2c43e0 --- /dev/null +++ b/app/assets/images/logoPredim.gif diff --git a/app/assets/images/logo_chouette.png b/app/assets/images/logo_chouette.png Binary files differnew file mode 100644 index 000000000..61eaaa0dd --- /dev/null +++ b/app/assets/images/logo_chouette.png diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 9b2c7f92e..fc25b5723 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -3,6 +3,5 @@ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at * the top of the compiled file, but it's generally better to create a new file per style scope. *= require_self - *= require user_interface *= require_tree . */
\ No newline at end of file diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss new file mode 100644 index 000000000..14823294f --- /dev/null +++ b/app/assets/stylesheets/layout.css.scss @@ -0,0 +1,8 @@ +/* Green theme */ +$header_background: #61970b; +$header_color: white; +$tabs_background: #86b41d; +$tabs_color: white; +$text_color: #222; + +@import "user_interface/layout"; diff --git a/app/assets/stylesheets/pagination.css.scss b/app/assets/stylesheets/pagination.css.scss index 66b4b9fbe..76ff3cb8f 100644 --- a/app/assets/stylesheets/pagination.css.scss +++ b/app/assets/stylesheets/pagination.css.scss @@ -18,18 +18,18 @@ > .current{ font-style: normal; font-weight: bold; - background: #666; + background: #61970b; color: white; - border: 1px solid #666; + border: 1px solid #61970b; } > a{ text-decoration: none; - color: #666; + color: #61970b; border: 1px solid #ddd; &:hover, &:focus{ - color: #000033; - border-color: #000033; + color: #86b41d; + border-color: #86b41d; } } diff --git a/app/assets/stylesheets/referentials.css.scss b/app/assets/stylesheets/referentials.css.scss index 14c7eef8a..721474cbd 100644 --- a/app/assets/stylesheets/referentials.css.scss +++ b/app/assets/stylesheets/referentials.css.scss @@ -1,3 +1,13 @@ // Place all the styles related to the referentials controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + + +ul.logos { + margin: 30px 30px 0 0; + + li { + display: inline; + margin: 0 3px; + } +}
\ No newline at end of file diff --git a/app/views/layouts/_logos.erb b/app/views/layouts/_logos.erb new file mode 100644 index 000000000..9c8aec154 --- /dev/null +++ b/app/views/layouts/_logos.erb @@ -0,0 +1,5 @@ +<ul class="logos"> + <li><%= image_tag "logoMedad.gif" %></li> + <li><%= image_tag "logoPredim.gif" %></li> + <li><%= image_tag "logoCertu.gif" %></li> +</ul>
\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6da2f13ca..91e65c214 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,11 +10,19 @@ </head> <body> <div id="header"> - <div class="infos"> - <%= render "layouts/user_links" %> - <h1>Chouette</h1> + <div class="infos"> + <div class="logo"> + <%= image_tag "logo_chouette.png" %> + </div> + <div class="title"> + <% if @referential.present? %> + <h1><%= @referential.name.upcase %></h1> + <% end %> + </div> + <div class="interaction"> + <%= render "layouts/user_links" %> + </div> </div> - <div class="tabs"> <ul class="main"> <% if !@referential.present? || @referential.new_record? %> diff --git a/app/views/referentials/index.html.erb b/app/views/referentials/index.html.erb index 15d521303..528c7b13b 100644 --- a/app/views/referentials/index.html.erb +++ b/app/views/referentials/index.html.erb @@ -5,6 +5,6 @@ <% content_for :sidebar do %> <ul class="actions"> <li><%= link_to t('referentials.actions.new'), new_referential_path, :class => "add" %></li> - <br> </ul> +<%= render "layouts/logos" %> <% end %> |
