diff options
| -rw-r--r-- | chimere_example_static/chimere/css/extra-styles.css | 74 | ||||
| -rw-r--r-- | templates/chimere/base.html | 1 | ||||
| -rw-r--r-- | templates/chimere/blocks/actions.html | 39 |
3 files changed, 85 insertions, 29 deletions
diff --git a/chimere_example_static/chimere/css/extra-styles.css b/chimere_example_static/chimere/css/extra-styles.css index cddbce1..29a1c30 100644 --- a/chimere_example_static/chimere/css/extra-styles.css +++ b/chimere_example_static/chimere/css/extra-styles.css @@ -71,6 +71,7 @@ a:hover, a:focus { border:0 transparent; border-left:1px solid #E7E7E7; padding:16px; + padding-top:60px; width:400px; background-image:url('../img/logo.jpg'); background-position:bottom center; @@ -132,3 +133,76 @@ a:hover, a:focus { .olControlZoomPanel { top: 95px; } + +span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button, +#categories-lnk, #search-lnk, .fa-chimere-action{ + font-variant: small-caps; + font-size: 1.1em; + margin-left: 0.3em; + color:#777; + padding-left:0; + font-weight:normal; +} + +#areas-div{ + line-height: 32px; +} + +#areas-div, span#permalink, #simple_button{ + display: inline; + padding: 0px; +} + +#permalink-lnk, #simple_button{ + line-height: 42px; +} + +#permalink-lnk{ + padding: 0px 0px 0px 1em; +} + +#simple_button{ + padding: 10px 15px; +} + +.nav-pills > li#simple_button-lnk > a > .fa{ + color:#777; +} + +.nav-pills > li > a > .fa{ + color: #54C200; +} + +.nav-pills > li.active > a > .fa{ + color:#fff; +} + +.navbar-default .navbar-brand{ + color:#327E04; + font-size:1em; +} + +.fa{ + font-size:1.4em; +} + +.fa-chimere-view:before{ + content:"\f06e"; +} + +.fa-chimere-contribute:before{ + content:"\f040"; +} + +.fa-chimere-rss:before{ + content:"\f09e"; +} + +.fa-chimere-contact:before{ + content:"\f1fa"; +} + +.fa-chimere-maps:before{ + content:"\f14e"; +} + diff --git a/templates/chimere/base.html b/templates/chimere/base.html index 2468571..9089251 100644 --- a/templates/chimere/base.html +++ b/templates/chimere/base.html @@ -8,6 +8,7 @@ {% if MOBILE %} <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/mobile.css" /> <script src="{{ STATIC_URL }}chimere/js/mobile.chimere.js" type="text/javascript"></script>{%endif%} +<link rel="stylesheet" href="{{ STATIC_URL }}font-awesome/css/font-awesome.min.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}bootstrap/bootstrap.min.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/form-compat.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/extra-styles.css" /> diff --git a/templates/chimere/blocks/actions.html b/templates/chimere/blocks/actions.html index 04fee47..4c4865f 100644 --- a/templates/chimere/blocks/actions.html +++ b/templates/chimere/blocks/actions.html @@ -6,13 +6,16 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="#">{{PROJECT_NAME}}</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 %}> - <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>{{ action.label }}</a> + <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> @@ -20,16 +23,16 @@ <ul class="nav nav-pills"> {% if is_map %} {% if areas_visible %} - <li>{% display_areas %}</li> - <li id='permalink'></li> + <li><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><a id='simple_button' href='{% url chimere:simple_index area_name_slash %}'>{% 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> {% trans "Simple map" %}</a></li> {% endif %} - <li{% if not has_search %} class='active'{%endif%}><a href='#categories' data-toggle='panel'>{% trans "Categories "%}</a></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 class='active'><a href='#search-box' data-toggle='panel'>{% trans "Search" %}</a></li> + <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 %} {% for action, subactions in actions %} @@ -48,25 +51,3 @@ </div> -<!-- -<div id="topbar"> - <ul id='action' class='action'> - {% for action, subactions in actions %} - <li class='ui-widget ui-button ui-state-default ui-corner-all {% ifequal action.id action_selected.0 %} ui-state-active{% endifequal %}'> - <a href='{{ action.url }}' onclick='jQuery("#map").chimere("saveExtent");'>{{ action.label }}</a> - </li> - {% endfor %} - </ul> - <ul id='action-2' class='action'> - {% for action, subactions in actions %} - {% ifequal action.id action_selected.0 %}{% if subactions %} - {% for subaction in subactions %} - <li class='ui-widget ui-button ui-state-default ui-corner-all{% ifequal subaction.id action_selected.1 %} ui-state-active{% endifequal %}'> - <a href='{{ subaction.url }}' onclick='saveExtent();'>{{ subaction.label }}</a> - </li> - {% endfor %} - {% endif %}{% endifequal %} - {% endfor %} - </ul> -</div> -!--> |