Skip to content

Commit

Permalink
propuesta de implementacion de wysiwyg #295 y diseño de nuevo evento #…
Browse files Browse the repository at this point in the history
  • Loading branch information
franexposito committed Jun 18, 2015
1 parent 823375a commit 43f9e7f
Show file tree
Hide file tree
Showing 7 changed files with 739 additions and 40 deletions.
81 changes: 81 additions & 0 deletions _dt/css/toolbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*** toolbar descripcion **/
#toolbar-descripcion .toolbar-tools {
background: #fff;
border-bottom: 1px solid #e7e7e7;
border-top: 1px solid #e7e7e7;
}

.wysiwyg-text-align-center {
text-align: center;
}

.wysiwyg-text-align-left {
text-align: left;
}

.wysiwyg-text-align-right {
text-align: right;
}

.editor-bt {
font-weight: bold;
padding: 5px;
margin: 1px 0;
border-radius: 2px;
display: inline-block;
color: black;
background: rgba(245,245,245,1);
background: -moz-linear-gradient(top, rgba(245,245,245,1) 0%, rgba(224,224,224,1) 100%);
background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(245,245,245,1)), color-stop(100%, rgba(224,224,224,1)));
background: -webkit-linear-gradient(top, rgba(245,245,245,1) 0%, rgba(224,224,224,1) 100%);
background: -o-linear-gradient(top, rgba(245,245,245,1) 0%, rgba(224,224,224,1) 100%);
background: -ms-linear-gradient(top, rgba(245,245,245,1) 0%, rgba(224,224,224,1) 100%);
background: linear-gradient(to bottom, rgba(245,245,245,1) 0%, rgba(224,224,224,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e0e0e0', GradientType=0 );
}

.editor-bt:hover {
color: black;
background: rgba(235,233,249,1);
background: -moz-linear-gradient(top, rgba(235,233,249,1) 0%, rgba(216,208,239,1) 50%, rgba(206,199,236,1) 51%, rgba(193,191,234,1) 100%);
background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(235,233,249,1)), color-stop(50%, rgba(216,208,239,1)), color-stop(51%, rgba(206,199,236,1)), color-stop(100%, rgba(193,191,234,1)));
background: -webkit-linear-gradient(top, rgba(235,233,249,1) 0%, rgba(216,208,239,1) 50%, rgba(206,199,236,1) 51%, rgba(193,191,234,1) 100%);
background: -o-linear-gradient(top, rgba(235,233,249,1) 0%, rgba(216,208,239,1) 50%, rgba(206,199,236,1) 51%, rgba(193,191,234,1) 100%);
background: -ms-linear-gradient(top, rgba(235,233,249,1) 0%, rgba(216,208,239,1) 50%, rgba(206,199,236,1) 51%, rgba(193,191,234,1) 100%);
background: linear-gradient(to bottom, rgba(235,233,249,1) 0%, rgba(216,208,239,1) 50%, rgba(206,199,236,1) 51%, rgba(193,191,234,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ebe9f9', endColorstr='#c1bfea', GradientType=0 );
}

.toolbar-tools a:first-child {
margin-left: 1px;
}

.toolbar-tools a:last-child {
margin-right: 1px;
}

#descripcion {
border: none;
box-shadow: none;
}

a {
text-decoration: none;
color: #c11f23;
}

.description-cont .btn-form {
background: #34c774;
border-radius: 0;
color: white;
border: none;
font-weight: bold;
font-size: 14px;
text-align: center;
}

.description-cont .btn-form:hover,
.description-cont .btn-form:focus {
background: #30b86b;
color: #fff;
}
21 changes: 18 additions & 3 deletions _dt/js/newevent.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,15 @@
var map;
var marker;
var markers = [];
var p = false;

$(document).ready(function() {
var editor = new wysihtml5.Editor("descripcion", { // id of textarea element
toolbar: "toolbar-descripcion", // id of toolbar element
stylesheets: "_dt/css/toolbar.css",
parserRules: wysihtml5ParserRules // defined in parser rules set
});

putMap();

$('.evenge-check').on('click', function() {
Expand All @@ -26,12 +33,11 @@ $(document).ready(function() {
}
});

$('.btn-form').on('click', function(evt) {
$('#create').on('click', function(evt) {
evt.preventDefault();
var isPrivado = true;
var isPrivado = p;
var lat = false;
var lon = false;
if ( $(this).data('type') === 'public' ) { isPrivado = false; }
if ( marker != null ) {
lat = marker.getPosition().lat();
lon = marker.getPosition().lng();
Expand Down Expand Up @@ -62,6 +68,15 @@ $(document).ready(function() {
}
});
});

$('.btn-form').on('click', function (evt) {
evt.preventDefault();
if ( $(this).data('type') === 'public' ) {
p = false;
} else {
p = true;
}
});
});

function putMap() {
Expand Down
Loading

0 comments on commit 43f9e7f

Please sign in to comment.