diff options
| -rw-r--r-- | chimere_example_static/chimere/css/extra-styles.css | 24 | ||||
| -rw-r--r-- | templates/chimere/blocks/actions.html | 52 | ||||
| -rw-r--r-- | templates/chimere/main_map.html | 4 |
3 files changed, 48 insertions, 32 deletions
diff --git a/chimere_example_static/chimere/css/extra-styles.css b/chimere_example_static/chimere/css/extra-styles.css index 9cec018..ab994dc 100644 --- a/chimere_example_static/chimere/css/extra-styles.css +++ b/chimere_example_static/chimere/css/extra-styles.css @@ -106,7 +106,7 @@ label.labelSpan.olButton{ #panel{ max-height:none; - right:0; + left:0; bottom:0; border:0 transparent; border-left:1px solid #E7E7E7; @@ -299,8 +299,7 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button, @media (min-width: 1552px) { #maps-lnk label, - #contact-lnk .lbl, - #rss-lnk .lbl{ + #contact-lnk .lbl{ display:inline; } } @@ -321,8 +320,7 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button, } @media (max-width: 767px) { - #news-lnk .lbl, #simple_button-lnk .lbl, #maps-lnk label, #contact-lnk .lbl, - #rss-lnk .lbl{ + #news-lnk .lbl, #simple_button-lnk .lbl, #maps-lnk label, #contact-lnk .lbl{ display:inline-block; } .selection-sep{ @@ -350,7 +348,7 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button, .show-hide-panel{ position:absolute; - right: 400px; + left: 400px; top: 0; bottom: 0; background-color:#eee; @@ -367,10 +365,11 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button, position:absolute; left:2px; top:200px; + color:#449506; } #show-panel{ - right:0; + left:0; display:none; } @@ -391,3 +390,14 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button, top:300px; } } + +#content .olControlSimplePanZoom{ + top: 18px !important; + left: auto !important; + right:50px !important; +} + +#content #main-map .olControlLayerSwitcher { + left: auto !important; + right:50px !important; +} diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html index 302c232..5af5cbc 100644 --- a/templates/chimere/blocks/actions.html +++ b/templates/chimere/blocks/actions.html @@ -6,23 +6,25 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="."><span class='fa fa-globe'></span></a> </div> <div class="navbar-collapse collapse"> - <ul class="nav navbar-nav"> + + <div class='navbar-left'> + <ul class="nav nav-pills"> {% for action, subactions in actions %} - <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> - </a> - </li> + {% ifequal action.id action_selected.0 %}{% if subactions %} + {% for subaction in subactions %} + <li{% ifequal subaction.id action_selected.1 %} class='active'{% endifequal %}> + <a href='{{ subaction.url }}' onclick='saveExtent();'>{{ subaction.label }}</a> + </li> + {% endfor %} + {% endif %}{% endifequal %} {% endfor %} - </ul> - <div class='tabbable navbar-right'> - <ul class="nav nav-pills"> {% if is_map %} - <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> + {% endif %} {% if areas_visible %} <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> @@ -33,22 +35,26 @@ <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> - {% endif %} {% endif %} + </ul> + </div> + + <div class='navbar-right'> + + <ul class="nav navbar-nav"> + <li class='selection-sep'> </li> {% for action, subactions in actions %} - {% ifequal action.id action_selected.0 %}{% if subactions %} - {% for subaction in subactions %} - <li{% ifequal subaction.id action_selected.1 %} class='active'{% endifequal %}> - <a href='{{ subaction.url }}' onclick='saveExtent();'>{{ subaction.label }}</a> - </li> - {% endfor %} - {% endif %}{% 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> + </a> + </li> {% endfor %} </ul> + </div> + </div> </div> </div> diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html index fd11546..5a9189d 100644 --- a/templates/chimere/main_map.html +++ b/templates/chimere/main_map.html @@ -13,8 +13,8 @@ {% block message_edit %}{% endblock %} {% block sidebar %} {% display_welcome %} - <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 class='show-hide-panel' id='hide-panel'><span class='fa fa-arrow-circle-left'></span></div> + <div class='show-hide-panel' id='show-panel'><span class='fa fa-arrow-circle-right'></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> |