expo-93 almost ready (raw result)

remotes/origin/1203
pavel 11 years ago
parent 8ea0541801
commit 719b30f844
  1. 10
      templates/client/includes/company/company_edit.html
  2. 39
      templates/client/static_client/css/main.css
  3. 84
      templates/client/static_client/js/_modules/page.company.js

@ -203,7 +203,8 @@
{% endwith %}
<hr />
<div class="form-item-wrap mb-05em">
<div class="form-item-wrap mb-1em address-wrap" id="address-block">
<a class="map-toggle" href="javascript:void(0);" data-show-text="{% trans 'Раскрыть карту' %}" data-hide-text="{% trans 'Скрыть карту' %}"><i class="fa fa-map-marker">&nbsp;</i><span class="label">Раскрыть карту</span></a>
<div class="i-descr add_link_text {% if address_form.address_inf.value %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""> <i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'адрес компании' %} <b>+15</b></div>
@ -232,13 +233,18 @@
</div>
</div>
<div class="map-wrap ">
<div id="gmap-canvas" style="height: 308px;">
<img src="http://www.placehold.it/779x305" alt=""/>
</div>
</div>
</div>
<div class="add_link_teg">
<div class="form-item-wrap">
<div class="i-tags i-descr {% if company.tag.all|length > 0 %}{% else %}hidden{% endif %}">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" style="margin-left: -6px;">{% trans 'редактировать' %}</a>
<p class="tags static-value">
{% with tags=company.tag.all %}
{% for tag in tags %}

@ -13526,4 +13526,41 @@ hr + .rq-note {
}
.news-filter-block .select2-container-multi .select2-choices .select2-search-field:first-child input{
line-height: 36px ;
}
}
/*****************\
# карта на странице профиля компании (google maps)
\*****************/
.address-wrap .map-wrap{
margin-top: 1em;
margin-bottom: 2em;
}
.address-wrap .map-wrap .gmap-canvas{
height: 308px;
}
.address-wrap .map-toggle{
display: block;
float: right;
color: #a2a2a2;
text-decoration: none;
position: relative;
z-index: 2;
}
.address-wrap .map-toggle:hover{
color: #ff6600;
}
.address-wrap .map-toggle:hover .label{
border: 0;
}
.address-wrap .map-toggle .label{
font-size: 15px;
line-height: 12px;
text-decoration: none;
border-bottom: 1px dashed;
}
.address-wrap .map-toggle .fa{
font-size: 1.3em;
}

@ -505,6 +505,83 @@ if (EXPO.company){
}
};
var Map = function (opt) {
var self = this;
this.opt = opt;
this.$wrapper= $("#address-block");
this.$toggle = $(".map-toggle",this.$wrapper);
this.$container = $(".map-wrap", this.$wrapper);
this.status ={
visible:false
};
this.$toggle.on("click", function () {
if($(this).hasClass("active")){
/**
* hide map
*/
self.hideMap();
}else{
/**
* show map
*/
self.showMap();
}
return false;
});
/**
* google map initialization
*/
var mapHolder = document.getElementById('gmap-canvas');
var initGooglemap = function () {
var mapOptions = {
zoom: 4
};
self.map = new google.maps.Map(mapHolder, mapOptions);
//var marker = new google.maps.Marker({
// position: myLatlng,
// map: map
//});
//todo: если есть город то геокодировать его + сделать автокомплит
var country = $("#id_country option:selected").text();
var geocoder = new google.maps.Geocoder();
geocoder.geocode({"address":country}, function (results, status) {
if (status == google.maps.GeocoderStatus.OK){
self.map.setCenter(results[0].geometry.location);
var marker = new google.maps.Marker({
map: self.map,
position: results[0].geometry.location
});
}else{
alert("Geocode was not successful for the following reason: " + status);
}
});
};
google.maps.event.addDomListener(window, 'load', initGooglemap);
};
Map.prototype = {
showMap: function () {
this.$toggle.addClass("active").children(".label").text(this.$toggle.attr("data-hide-text"));
this.status.visible = true;
this.$container.removeClass("hidden");
},
hideMap: function () {
this.$toggle.removeClass("active").children(".label").text(this.$toggle.attr("data-show-text"));
this.status.visible = false;
this.$container.addClass("hidden");
},
refresh: function () {
}
};
// methods
//инициализация общих свойств
@ -807,9 +884,10 @@ if (EXPO.company){
* preview button
*/
$('#'+self.opt.previewBtnId).attr('href',window.location.href+"?logout=1");
//$('#'+self.opt.previewBtnId).on("click", function () {
//
//});
/**
* google map
*/
this.map = new Map();
});

Loading…
Cancel
Save