diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-16 18:46:36 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-09-25 16:22:48 +0200 |
commit | 2728791ebd4ec41a23a9d428956024d86b2b5a0d (patch) | |
tree | 23fa7d2a65785db0bedb4a02575410616b0b23de | |
parent | 1e455da0fc56b933382e84e98e2d6b1a05efa98f (diff) | |
download | Chimère - projet Saclay-2728791ebd4ec41a23a9d428956024d86b2b5a0d.tar.bz2 Chimère - projet Saclay-2728791ebd4ec41a23a9d428956024d86b2b5a0d.zip |
Search: add new images for menu, style and template change
-rw-r--r-- | static/saclay/css/styles.css | 37 | ||||
-rw-r--r-- | static/saclay/images/button-cat-three-off.png | bin | 0 -> 805 bytes | |||
-rw-r--r-- | static/saclay/images/button-cat-three-on.png | bin | 0 -> 1232 bytes | |||
-rw-r--r-- | static/saclay/images/button-route-three-off.png | bin | 0 -> 900 bytes | |||
-rw-r--r-- | static/saclay/images/button-route-three-on.png | bin | 0 -> 806 bytes | |||
-rw-r--r-- | static/saclay/images/button-search-off.png | bin | 0 -> 805 bytes | |||
-rw-r--r-- | static/saclay/images/button-search-on.png | bin | 0 -> 640 bytes | |||
-rw-r--r-- | templates/chimere/main_map.html | 6 |
8 files changed, 38 insertions, 5 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index e771842..7315d09 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -751,6 +751,12 @@ ul#action{ margin-top:22px; } +#action-panel.three .action li { + padding: 0px; + height: 38px; + width: 92px; +} + .action li, .action li a, .action li label{ @@ -897,9 +903,34 @@ ul#action{ background-repeat:no-repeat; } -#action-routing.state-active, -#action-routing:hover{ - background-image:url(../images/button-route-on.png) ; +.three #action-categories{ + background-image:url(../images/button-cat-three-off.png) ; + margin-right:3px; +} + +.three #action-categories.state-active, +.three #action-categories:hover{ + background-image:url(../images/button-cat-three-on.png) ; +} + +.three #action-routing{ + background-image:url(../images/button-route-three-off.png) ; +} + +.three #action-routing.state-active, +.three #action-routing:hover{ + background-image:url(../images/button-route-three-on.png) ; +} + +#action-search{ + background-image:url(../images/button-search-off.png) ; + background-repeat:no-repeat; + margin-right:3px; +} + +#action-search.state-active, +#action-search:hover{ + background-image:url(../images/button-search-on.png) ; background-repeat:no-repeat; } diff --git a/static/saclay/images/button-cat-three-off.png b/static/saclay/images/button-cat-three-off.png Binary files differnew file mode 100644 index 0000000..a581a6b --- /dev/null +++ b/static/saclay/images/button-cat-three-off.png diff --git a/static/saclay/images/button-cat-three-on.png b/static/saclay/images/button-cat-three-on.png Binary files differnew file mode 100644 index 0000000..1c90751 --- /dev/null +++ b/static/saclay/images/button-cat-three-on.png diff --git a/static/saclay/images/button-route-three-off.png b/static/saclay/images/button-route-three-off.png Binary files differnew file mode 100644 index 0000000..ad65794 --- /dev/null +++ b/static/saclay/images/button-route-three-off.png diff --git a/static/saclay/images/button-route-three-on.png b/static/saclay/images/button-route-three-on.png Binary files differnew file mode 100644 index 0000000..ea096b3 --- /dev/null +++ b/static/saclay/images/button-route-three-on.png diff --git a/static/saclay/images/button-search-off.png b/static/saclay/images/button-search-off.png Binary files differnew file mode 100644 index 0000000..8aa6f96 --- /dev/null +++ b/static/saclay/images/button-search-off.png diff --git a/static/saclay/images/button-search-on.png b/static/saclay/images/button-search-on.png Binary files differnew file mode 100644 index 0000000..27f6d69 --- /dev/null +++ b/static/saclay/images/button-search-on.png diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html index a14ea3f..76b46fd 100644 --- a/templates/chimere/main_map.html +++ b/templates/chimere/main_map.html @@ -24,11 +24,13 @@ {% block sidebar %} <div class='sidebar-handler' id='sidebar-handler-hide'> </div> - <div id='action-panel'> + <div id='action-panel'{% if has_search %} class='three'{% endif %}> <ul id='map-actions' class='action'> <li id='action-categories' class='state-active'> <label>{% trans "Categories" %}</label> - </li>{% if itinerary_form %} + </li>{% if has_search %}<li id='action-search'> + <label>{% trans "Search" %}</label> + </li>{% endif %}{% if itinerary_form %} <li id='action-routing'> <label>{% trans "Routing" %}</label> </li>{% endif %} |