diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-24 20:42:33 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-24 20:42:33 +0100 |
| commit | 0185b94ec99d7d11a35349a310e57b06d55c2df3 (patch) | |
| tree | 24a0223f485b4d318be2933cd0f506debcde1371 /templates | |
| parent | 6bcf3e51cba6bc4211e6e64bc6e0ec03e90eed8a (diff) | |
| download | Chimère - projet de référence-0185b94ec99d7d11a35349a310e57b06d55c2df3.tar.bz2 Chimère - projet de référence-0185b94ec99d7d11a35349a310e57b06d55c2df3.zip | |
CSS (especially for small screens) and JS fixes
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/chimere/blocks/actions.html | 10 | ||||
| -rw-r--r-- | templates/chimere/main_map.html | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html index 4c4865f..1aaf5c2 100644 --- a/templates/chimere/blocks/actions.html +++ b/templates/chimere/blocks/actions.html @@ -6,12 +6,12 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="#"><span class='fa fa-globe'></span></a> + <a class="navbar-brand" href="."><span class='fa fa-globe'></span></a> </div> <div class="navbar-collapse collapse"> <ul class="nav navbar-nav"> {% for action, subactions in actions %} - <li{% ifequal action.id action_selected.0 %} class="active"{% endifequal %}> + <li id='{{action.id}}-lnk'{% ifequal action.id action_selected.0 %} class="active"{% endifequal %}> <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'> <span class='fa fa-chimere-action fa-chimere-{{action.id}}'></span> <span class='lbl'>{{ action.label }}</span> @@ -22,14 +22,16 @@ <div class='tabbable navbar-right'> <ul class="nav nav-pills"> {% if is_map %} + <li class='selection-sep'> </li> {% if areas_visible %} - <li><span class='fa fa-chimere-action fa-chimere-maps'></span>{% display_areas %}</li> + <li id='maps-lnk'><span class='fa fa-chimere-action fa-chimere-maps'></span>{% display_areas %}</li> <li id='permalink-lnk'><span class='fa fa-chimere-action fa-bookmark'></span><span id='permalink'></span></li> <li>{% routing %}</li> <li>{% display_welcome %}</li> <li>{% display_news news_visible %}</li> - <li id="simple_button-lnk"><a id='simple_button' href='{% url chimere:simple_index area_name_slash %}'><span class='fa fa-chimere-action fa-simplybuilt'></span> {% trans "Simple map" %}</a></li> + <li id="simple_button-lnk"><a id='simple_button' href='{% url chimere:simple_index area_name_slash %}'><span class='fa fa-chimere-action fa-simplybuilt'></span><span class='lbl'> {% trans "Simple map" %}</span></a></li> {% endif %} + <li class='selection-sep'> </li> <li id='categories-lnk'{% if not has_search %} class='active'{%endif%}><a href='#categories' data-toggle='panel'><span class='fa fa-chimere-action fa-check-circle-o'></span> {% trans "Categories "%}</a></li> {% if has_search %} <li id='search-lnk' class='active'><a href='#search-box' data-toggle='panel'><span class="glyphicon glyphicon-search"></span> {% trans "Search" %}</a></li> diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html index 9d99c05..caad4b4 100644 --- a/templates/chimere/main_map.html +++ b/templates/chimere/main_map.html @@ -12,7 +12,9 @@ {% endblock %} {% block message_edit %}{% endblock %} {% block sidebar %} - <div id='panel'class='navbar-default'> + <div class='show-hide-panel' id='hide-panel'><span class='fa fa-arrow-circle-right'></span></div> + <div class='show-hide-panel' id='show-panel'><span class='fa fa-arrow-circle-left'></span></div> + <div id='panel' class='navbar-default'> <form id="frm_categories"><div id='categories'></div></form> <div id='search-box' class='ui-widget ui-corner-all'></div> </div> |