Replaced datepicker with customized version (bundled into jquery-ui).

This commit is contained in:
Hike Danakian 2013-06-08 14:18:22 -07:00
Родитель b9545326c8
Коммит acf02a5421
28 изменённых файлов: 2437 добавлений и 15627 удалений

Просмотреть файл

@ -3,7 +3,7 @@
body#events .overlay-container {
position: relative;
margin: 0px auto;
max-width: 1200px;
max-width: 1080px;
}
body#events .map-overlay {
position: absolute;
@ -53,7 +53,6 @@ body#events .map-overlay {
.redButton;
}
.cell {
display: block;
overflow: hidden;
@ -63,19 +62,23 @@ body#events .map-overlay {
}
.ui-select {
box-sizing: content-box;
margin: 4px;
}
.datetime > *[class^="ui-"] {
margin: 4px;
input {
padding: 0px 10px;
}
vertical-align: top;
.icon-calendar {
padding-right: 6px;
vertical-align: middle;
}
.ui-input {
&.select-time {
padding: 0px;
input {
.ui-small;
margin-left: 1em;
}
}
@ -160,11 +163,11 @@ body#events .map-overlay {
float: left;
clear: left;
}
label,.md-editor,input,select {
label,.md-editor,input {
vertical-align: top;
font-size: 13px;
}
.md-editor,input,select {
.md-editor,input {
background: white;
outline: 0px;
border: 0.5px solid #444;
@ -203,9 +206,6 @@ body#events .map-overlay {
}
}
}
input,select {
padding: 0px 10px;
}
input[name="title"] {
min-width: 21em;
}
@ -246,3 +246,8 @@ body#events .map-overlay {
}
}
}
.ui-datepicker {
border: 1px solid #ddd;
margin-left: -34.5px;
margin-top: 11px;
}

Просмотреть файл

@ -1,7 +1,6 @@
@import "event_create";
@import "event_details";
@import "map";
@import "ui-datepicker";
@import "mixins";
@import "marker_info_window";

Просмотреть файл

@ -1,10 +0,0 @@
.ui-datepicker {
border: 1px solid #ddd;
margin-left: -34.5px;
margin-top: 11px;
&, & * {
border-radius: 0px;
}
}

Просмотреть файл

@ -22,7 +22,7 @@ module.exports = function () {
var Model; Model = function(name, fields, init) {
var config = {};
Object.keys(fields)
.filter(function (f) { return f.match(/^\$/); })
.filter(function (f) { return f.match(/^\$/) })
.forEach(function (f) {
config[f.replace(/^\$/, '')] = fields[f];
delete fields[f];
@ -40,7 +40,7 @@ module.exports = function () {
Object.keys(typedefs).forEach(function (t) {
var type = typedefs[t].type;
types[t] = util.autoconfig(typedefs[t])({ toString: type.toString.bind(type) });
util.defProp(types[t], 'type', { get: function () { return this.toString(); } });
util.defProp(types[t], 'type', { get: function () { return this.toString() } });
});
return types;
}

Просмотреть файл

@ -1,7 +1,7 @@
/*! jQuery UI - v1.10.3 - 2013-05-03
/*! jQuery UI - v1.10.3 - 2013-06-08
* http://jqueryui.com
* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
* Includes: jquery.ui.core.css, jquery.ui.datepicker.css
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=&fwDefault=normal&fsDefault=&cornerRadius=0px&bgColorHeader=%23cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=%23aaaaaa&fcHeader=%23222222&iconColorHeader=%23222222&bgColorContent=%23ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=%23aaaaaa&fcContent=%23222222&iconColorContent=%23222222&bgColorDefault=%23e6e6e6&bgTextureDefault=glow_ball&bgImgOpacityDefault=75&borderColorDefault=%23d3d3d3&fcDefault=%23555555&iconColorDefault=%23888888&bgColorHover=%23dadada&bgTextureHover=spotlight&bgImgOpacityHover=75&borderColorHover=%23999999&fcHover=%23212121&iconColorHover=%23454545&bgColorActive=%23ffffff&bgTextureActive=inset_soft&bgImgOpacityActive=65&borderColorActive=%23aaaaaa&fcActive=%23212121&iconColorActive=%23454545&bgColorHighlight=%23fbf9ee&bgTextureHighlight=highlight_hard&bgImgOpacityHighlight=55&borderColorHighlight=%23fcefa1&fcHighlight=%23363636&iconColorHighlight=%232e83ff&bgColorError=%23fef1ec&bgTextureError=diagonals_thick&bgImgOpacityError=95&borderColorError=%23cd0a0a&fcError=%23cd0a0a&iconColorError=%23cd0a0a&bgColorOverlay=%23aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=%23aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=2px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */
/* Layout helpers
@ -86,144 +86,6 @@
width: 100%;
height: 100%;
}
.ui-accordion .ui-accordion-header {
display: block;
cursor: pointer;
position: relative;
margin-top: 2px;
padding: .5em .5em .5em .7em;
min-height: 0; /* support: IE7 */
}
.ui-accordion .ui-accordion-icons {
padding-left: 2.2em;
}
.ui-accordion .ui-accordion-noicons {
padding-left: .7em;
}
.ui-accordion .ui-accordion-icons .ui-accordion-icons {
padding-left: 2.2em;
}
.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
position: absolute;
left: .5em;
top: 50%;
margin-top: -8px;
}
.ui-accordion .ui-accordion-content {
padding: 1em 2.2em;
border-top: 0;
overflow: auto;
}
.ui-autocomplete {
position: absolute;
top: 0;
left: 0;
cursor: default;
}
.ui-button {
display: inline-block;
position: relative;
padding: 0;
line-height: normal;
margin-right: .1em;
cursor: pointer;
vertical-align: middle;
text-align: center;
overflow: visible; /* removes extra width in IE */
}
.ui-button,
.ui-button:link,
.ui-button:visited,
.ui-button:hover,
.ui-button:active {
text-decoration: none;
}
/* to make room for the icon, a width needs to be set here */
.ui-button-icon-only {
width: 2.2em;
}
/* button elements seem to need a little more width */
button.ui-button-icon-only {
width: 2.4em;
}
.ui-button-icons-only {
width: 3.4em;
}
button.ui-button-icons-only {
width: 3.7em;
}
/* button text element */
.ui-button .ui-button-text {
display: block;
line-height: normal;
}
.ui-button-text-only .ui-button-text {
padding: .4em 1em;
}
.ui-button-icon-only .ui-button-text,
.ui-button-icons-only .ui-button-text {
padding: .4em;
text-indent: -9999999px;
}
.ui-button-text-icon-primary .ui-button-text,
.ui-button-text-icons .ui-button-text {
padding: .4em 1em .4em 2.1em;
}
.ui-button-text-icon-secondary .ui-button-text,
.ui-button-text-icons .ui-button-text {
padding: .4em 2.1em .4em 1em;
}
.ui-button-text-icons .ui-button-text {
padding-left: 2.1em;
padding-right: 2.1em;
}
/* no icon support for input elements, provide padding by default */
input.ui-button {
padding: .4em 1em;
}
/* button icon element(s) */
.ui-button-icon-only .ui-icon,
.ui-button-text-icon-primary .ui-icon,
.ui-button-text-icon-secondary .ui-icon,
.ui-button-text-icons .ui-icon,
.ui-button-icons-only .ui-icon {
position: absolute;
top: 50%;
margin-top: -8px;
}
.ui-button-icon-only .ui-icon {
left: 50%;
margin-left: -8px;
}
.ui-button-text-icon-primary .ui-button-icon-primary,
.ui-button-text-icons .ui-button-icon-primary,
.ui-button-icons-only .ui-button-icon-primary {
left: .5em;
}
.ui-button-text-icon-secondary .ui-button-icon-secondary,
.ui-button-text-icons .ui-button-icon-secondary,
.ui-button-icons-only .ui-button-icon-secondary {
right: .5em;
}
/* button sets */
.ui-buttonset {
margin-right: 7px;
}
.ui-buttonset .ui-button {
margin-left: 0;
margin-right: -.3em;
}
/* workarounds */
/* reset extra padding in Firefox, see h5bp.com/l */
input.ui-button::-moz-focus-inner,
button.ui-button::-moz-focus-inner {
border: 0;
padding: 0;
}
.ui-datepicker {
width: 17em;
padding: .2em .2em 0;
@ -392,402 +254,12 @@ button.ui-button::-moz-focus-inner {
border-right-width: 0;
border-left-width: 1px;
}
.ui-dialog {
position: absolute;
top: 0;
left: 0;
padding: .2em;
outline: 0;
}
.ui-dialog .ui-dialog-titlebar {
padding: .4em 1em;
position: relative;
}
.ui-dialog .ui-dialog-title {
float: left;
margin: .1em 0;
white-space: nowrap;
width: 90%;
overflow: hidden;
text-overflow: ellipsis;
}
.ui-dialog .ui-dialog-titlebar-close {
position: absolute;
right: .3em;
top: 50%;
width: 21px;
margin: -10px 0 0 0;
padding: 1px;
height: 20px;
}
.ui-dialog .ui-dialog-content {
position: relative;
border: 0;
padding: .5em 1em;
background: none;
overflow: auto;
}
.ui-dialog .ui-dialog-buttonpane {
text-align: left;
border-width: 1px 0 0 0;
background-image: none;
margin-top: .5em;
padding: .3em 1em .5em .4em;
}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: right;
}
.ui-dialog .ui-dialog-buttonpane button {
margin: .5em .4em .5em 0;
cursor: pointer;
}
.ui-dialog .ui-resizable-se {
width: 12px;
height: 12px;
right: -5px;
bottom: -5px;
background-position: 16px 16px;
}
.ui-draggable .ui-dialog-titlebar {
cursor: move;
}
.ui-menu {
list-style: none;
padding: 2px;
margin: 0;
display: block;
outline: none;
}
.ui-menu .ui-menu {
margin-top: -3px;
position: absolute;
}
.ui-menu .ui-menu-item {
margin: 0;
padding: 0;
width: 100%;
/* support: IE10, see #8844 */
list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
}
.ui-menu .ui-menu-divider {
margin: 5px -2px 5px -2px;
height: 0;
font-size: 0;
line-height: 0;
border-width: 1px 0 0 0;
}
.ui-menu .ui-menu-item a {
text-decoration: none;
display: block;
padding: 2px .4em;
line-height: 1.5;
min-height: 0; /* support: IE7 */
font-weight: normal;
}
.ui-menu .ui-menu-item a.ui-state-focus,
.ui-menu .ui-menu-item a.ui-state-active {
font-weight: normal;
margin: -1px;
}
.ui-menu .ui-state-disabled {
font-weight: normal;
margin: .4em 0 .2em;
line-height: 1.5;
}
.ui-menu .ui-state-disabled a {
cursor: default;
}
/* icon support */
.ui-menu-icons {
position: relative;
}
.ui-menu-icons .ui-menu-item a {
position: relative;
padding-left: 2em;
}
/* left-aligned */
.ui-menu .ui-icon {
position: absolute;
top: .2em;
left: .2em;
}
/* right-aligned */
.ui-menu .ui-menu-icon {
position: static;
float: right;
}
.ui-progressbar {
height: 2em;
text-align: left;
overflow: hidden;
}
.ui-progressbar .ui-progressbar-value {
margin: -1px;
height: 100%;
}
.ui-progressbar .ui-progressbar-overlay {
background: url("images/animated-overlay.gif");
height: 100%;
filter: alpha(opacity=25);
opacity: 0.25;
}
.ui-progressbar-indeterminate .ui-progressbar-value {
background-image: none;
}
.ui-resizable {
position: relative;
}
.ui-resizable-handle {
position: absolute;
font-size: 0.1px;
display: block;
}
.ui-resizable-disabled .ui-resizable-handle,
.ui-resizable-autohide .ui-resizable-handle {
display: none;
}
.ui-resizable-n {
cursor: n-resize;
height: 7px;
width: 100%;
top: -5px;
left: 0;
}
.ui-resizable-s {
cursor: s-resize;
height: 7px;
width: 100%;
bottom: -5px;
left: 0;
}
.ui-resizable-e {
cursor: e-resize;
width: 7px;
right: -5px;
top: 0;
height: 100%;
}
.ui-resizable-w {
cursor: w-resize;
width: 7px;
left: -5px;
top: 0;
height: 100%;
}
.ui-resizable-se {
cursor: se-resize;
width: 12px;
height: 12px;
right: 1px;
bottom: 1px;
}
.ui-resizable-sw {
cursor: sw-resize;
width: 9px;
height: 9px;
left: -5px;
bottom: -5px;
}
.ui-resizable-nw {
cursor: nw-resize;
width: 9px;
height: 9px;
left: -5px;
top: -5px;
}
.ui-resizable-ne {
cursor: ne-resize;
width: 9px;
height: 9px;
right: -5px;
top: -5px;
}
.ui-selectable-helper {
position: absolute;
z-index: 100;
border: 1px dotted black;
}
.ui-slider {
position: relative;
text-align: left;
}
.ui-slider .ui-slider-handle {
position: absolute;
z-index: 2;
width: 1.2em;
height: 1.2em;
cursor: default;
}
.ui-slider .ui-slider-range {
position: absolute;
z-index: 1;
font-size: .7em;
display: block;
border: 0;
background-position: 0 0;
}
/* For IE8 - See #6727 */
.ui-slider.ui-state-disabled .ui-slider-handle,
.ui-slider.ui-state-disabled .ui-slider-range {
filter: inherit;
}
.ui-slider-horizontal {
height: .8em;
}
.ui-slider-horizontal .ui-slider-handle {
top: -.3em;
margin-left: -.6em;
}
.ui-slider-horizontal .ui-slider-range {
top: 0;
height: 100%;
}
.ui-slider-horizontal .ui-slider-range-min {
left: 0;
}
.ui-slider-horizontal .ui-slider-range-max {
right: 0;
}
.ui-slider-vertical {
width: .8em;
height: 100px;
}
.ui-slider-vertical .ui-slider-handle {
left: -.3em;
margin-left: 0;
margin-bottom: -.6em;
}
.ui-slider-vertical .ui-slider-range {
left: 0;
width: 100%;
}
.ui-slider-vertical .ui-slider-range-min {
bottom: 0;
}
.ui-slider-vertical .ui-slider-range-max {
top: 0;
}
.ui-spinner {
position: relative;
display: inline-block;
overflow: hidden;
padding: 0;
vertical-align: middle;
}
.ui-spinner-input {
border: none;
background: none;
color: inherit;
padding: 0;
margin: .2em 0;
vertical-align: middle;
margin-left: .4em;
margin-right: 22px;
}
.ui-spinner-button {
width: 16px;
height: 50%;
font-size: .5em;
padding: 0;
margin: 0;
text-align: center;
position: absolute;
cursor: default;
display: block;
overflow: hidden;
right: 0;
}
/* more specificity required here to overide default borders */
.ui-spinner a.ui-spinner-button {
border-top: none;
border-bottom: none;
border-right: none;
}
/* vertical centre icon */
.ui-spinner .ui-icon {
position: absolute;
margin-top: -8px;
top: 50%;
left: 0;
}
.ui-spinner-up {
top: 0;
}
.ui-spinner-down {
bottom: 0;
}
/* TR overrides */
.ui-spinner .ui-icon-triangle-1-s {
/* need to fix icons sprite */
background-position: -65px -16px;
}
.ui-tabs {
position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
padding: .2em;
}
.ui-tabs .ui-tabs-nav {
margin: 0;
padding: .2em .2em 0;
}
.ui-tabs .ui-tabs-nav li {
list-style: none;
float: left;
position: relative;
top: 0;
margin: 1px .2em 0 0;
border-bottom-width: 0;
padding: 0;
white-space: nowrap;
}
.ui-tabs .ui-tabs-nav li a {
float: left;
padding: .5em 1em;
text-decoration: none;
}
.ui-tabs .ui-tabs-nav li.ui-tabs-active {
margin-bottom: -1px;
padding-bottom: 1px;
}
.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
.ui-tabs .ui-tabs-nav li.ui-state-disabled a,
.ui-tabs .ui-tabs-nav li.ui-tabs-loading a {
cursor: text;
}
.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
cursor: pointer;
}
.ui-tabs .ui-tabs-panel {
display: block;
border-width: 0;
padding: 1em 1.4em;
background: none;
}
.ui-tooltip {
padding: 8px;
position: absolute;
z-index: 9999;
max-width: 300px;
-webkit-box-shadow: 0 0 5px #aaa;
box-shadow: 0 0 5px #aaa;
}
body .ui-tooltip {
border-width: 2px;
}
/* Component containers
----------------------------------*/
.ui-widget {
font-family: Verdana,Arial,sans-serif;
font-size: 1.1em;
font-family: inherit;
font-size: ;
}
.ui-widget .ui-widget {
font-size: 1em;
@ -796,12 +268,12 @@ body .ui-tooltip {
.ui-widget select,
.ui-widget textarea,
.ui-widget button {
font-family: Verdana,Arial,sans-serif;
font-family: inherit;
font-size: 1em;
}
.ui-widget-content {
border: 1px solid #aaaaaa;
background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
background: #ffffff url(/ext/img/jquery.ui-custom/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
color: #222222;
}
.ui-widget-content a {
@ -809,7 +281,7 @@ body .ui-tooltip {
}
.ui-widget-header {
border: 1px solid #aaaaaa;
background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
background: #cccccc url(/ext/img/jquery.ui-custom/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
color: #222222;
font-weight: bold;
}
@ -823,7 +295,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
border: 1px solid #d3d3d3;
background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
background: #e6e6e6 url(/ext/img/jquery.ui-custom/ui-bg_glow-ball_75_e6e6e6_600x600.png) 50% 50% repeat-x;
font-weight: normal;
color: #555555;
}
@ -840,7 +312,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus {
border: 1px solid #999999;
background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
background: #dadada url(/ext/img/jquery.ui-custom/ui-bg_spotlight_75_dadada_600x600.png) 50% 50% repeat-x;
font-weight: normal;
color: #212121;
}
@ -855,7 +327,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
border: 1px solid #aaaaaa;
background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
background: #ffffff url(/ext/img/jquery.ui-custom/ui-bg_inset-soft_65_ffffff_1x100.png) 50% 50% repeat-x;
font-weight: normal;
color: #212121;
}
@ -872,7 +344,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight {
border: 1px solid #fcefa1;
background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
background: #fbf9ee url(/ext/img/jquery.ui-custom/ui-bg_highlight-hard_55_fbf9ee_1x100.png) 50% top repeat-x;
color: #363636;
}
.ui-state-highlight a,
@ -884,7 +356,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-error,
.ui-widget-header .ui-state-error {
border: 1px solid #cd0a0a;
background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
background: #fef1ec url(/ext/img/jquery.ui-custom/ui-bg_diagonals-thick_95_fef1ec_40x40.png) 50% 50% repeat;
color: #cd0a0a;
}
.ui-state-error a,
@ -930,27 +402,27 @@ body .ui-tooltip {
}
.ui-icon,
.ui-widget-content .ui-icon {
background-image: url(images/ui-icons_222222_256x240.png);
background-image: url(/ext/img/jquery.ui-custom/ui-icons_222222_256x240.png);
}
.ui-widget-header .ui-icon {
background-image: url(images/ui-icons_222222_256x240.png);
background-image: url(/ext/img/jquery.ui-custom/ui-icons_222222_256x240.png);
}
.ui-state-default .ui-icon {
background-image: url(images/ui-icons_888888_256x240.png);
background-image: url(/ext/img/jquery.ui-custom/ui-icons_888888_256x240.png);
}
.ui-state-hover .ui-icon,
.ui-state-focus .ui-icon {
background-image: url(images/ui-icons_454545_256x240.png);
background-image: url(/ext/img/jquery.ui-custom/ui-icons_454545_256x240.png);
}
.ui-state-active .ui-icon {
background-image: url(images/ui-icons_454545_256x240.png);
background-image: url(/ext/img/jquery.ui-custom/ui-icons_454545_256x240.png);
}
.ui-state-highlight .ui-icon {
background-image: url(images/ui-icons_2e83ff_256x240.png);
background-image: url(/ext/img/jquery.ui-custom/ui-icons_2e83ff_256x240.png);
}
.ui-state-error .ui-icon,
.ui-state-error-text .ui-icon {
background-image: url(images/ui-icons_cd0a0a_256x240.png);
background-image: url(/ext/img/jquery.ui-custom/ui-icons_cd0a0a_256x240.png);
}
/* positioning */
@ -1140,37 +612,37 @@ body .ui-tooltip {
.ui-corner-top,
.ui-corner-left,
.ui-corner-tl {
border-top-left-radius: 4px;
border-top-left-radius: 0px;
}
.ui-corner-all,
.ui-corner-top,
.ui-corner-right,
.ui-corner-tr {
border-top-right-radius: 4px;
border-top-right-radius: 0px;
}
.ui-corner-all,
.ui-corner-bottom,
.ui-corner-left,
.ui-corner-bl {
border-bottom-left-radius: 4px;
border-bottom-left-radius: 0px;
}
.ui-corner-all,
.ui-corner-bottom,
.ui-corner-right,
.ui-corner-br {
border-bottom-right-radius: 4px;
border-bottom-right-radius: 0px;
}
/* Overlays */
.ui-widget-overlay {
background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
background: #aaaaaa url(/ext/img/jquery.ui-custom/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
opacity: .3;
filter: Alpha(Opacity=30);
}
.ui-widget-shadow {
margin: -8px 0 0 -8px;
padding: 8px;
background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
padding: 2px;
background: #aaaaaa url(/ext/img/jquery.ui-custom/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
opacity: .3;
filter: Alpha(Opacity=30);
border-radius: 8px;

Двоичные данные
static/ext/img/jquery.ui-custom/animated-overlay.gif Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 1.7 KiB

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 420 B

Двоичные данные
static/ext/img/jquery.ui-custom/ui-bg_flat_0_aaaaaa_40x100.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 212 B

Двоичные данные
static/ext/img/jquery.ui-custom/ui-bg_flat_75_ffffff_40x100.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 208 B

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 33 KiB

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 323 B

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 280 B

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 203 B

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 38 KiB

Двоичные данные
static/ext/img/jquery.ui-custom/ui-icons_222222_256x240.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 6.8 KiB

Двоичные данные
static/ext/img/jquery.ui-custom/ui-icons_2e83ff_256x240.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 4.4 KiB

Двоичные данные
static/ext/img/jquery.ui-custom/ui-icons_454545_256x240.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 6.8 KiB

Двоичные данные
static/ext/img/jquery.ui-custom/ui-icons_888888_256x240.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 6.8 KiB

Двоичные данные
static/ext/img/jquery.ui-custom/ui-icons_cd0a0a_256x240.png Normal file

Двоичный файл не отображается.

После

Ширина:  |  Высота:  |  Размер: 4.4 KiB

Разница между файлами не показана из-за своего большого размера Загрузить разницу

15003
static/ext/js/jquery-ui.js поставляемый

Разница между файлами не показана из-за своего большого размера Загрузить разницу

4
static/ext/js/jquery.css3finalize-v3.x.min.js поставляемый Normal file

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -1,15 +1,15 @@
define(['jquery', 'model', '../base/ui', 'jquery-ui', 'bootstrap-markdown', 'jquery.form', 'jquery.timepicker'],
define(['jquery', 'model', '../base/ui', 'bootstrap-markdown', 'jquery.form', 'jquery.timepicker', 'jquery-ui.datepicker'],
function ($, EventModel, UI) { return function (mapMaker) {
$.event.props.push('dataTransfer');
$(document).ready(function () {
var $create_form = $('form#create-event');
var $find_form = $('form#find-event');
var $createForm = $('form#create-event');
var $findForm = $('form#find-event');
var $file_input = $create_form.find('input[type="file"]');
var $upload_div = $create_form.find('#image-upload');
$upload_div.on("click", function(ev) {
var $fileInput = $createForm.find('input[type="file"]');
var $uploadDiv = $createForm.find('#image-upload');
$uploadDiv.on("click", function(ev) {
ev.preventDefault();
$file_input.click();
$fileInput.click();
}).on("dragenter dragover drop", function(ev) {
ev.preventDefault();
ev.stopPropagation();
@ -18,16 +18,16 @@ function ($, EventModel, UI) { return function (mapMaker) {
ev.stopPropagation();
handleImg(ev.dataTransfer.files[0]);
});
$file_input.on("change", function (ev) {
$fileInput.on("change", function (ev) {
handleImg(this.files[0]);
});
// based on MDN example
function handleImg(file) {
if (file.type.match(/image.*/)) {
if (!$upload_div._prev_text)
$upload_div._prev_text = $upload_div.text();
$upload_div.html("<img />");
var img = $upload_div.find("img")[0];
if (!$uploadDiv._prev_text)
$uploadDiv._prev_text = $uploadDiv.text();
$uploadDiv.html("<img />");
var img = $uploadDiv.find("img")[0];
img.file = file;
var reader = new FileReader();
@ -41,13 +41,13 @@ function ($, EventModel, UI) { return function (mapMaker) {
}
}
$create_form.find('button[type="submit"]').click(function (ev) {
$createForm.find('button[type="submit"]').click(function (ev) {
ev.preventDefault();
$create_form.submit();
$createForm.submit();
});
$create_form.on("submit", function(ev) {
$createForm.on("submit", function(ev) {
ev.preventDefault();
var form_fields = $create_form.serializeArray();
var form_fields = $createForm.serializeArray();
var data = { event: {} };
form_fields.forEach(function (f) {
if (f.name) switch (f.name) {
@ -59,7 +59,7 @@ function ($, EventModel, UI) { return function (mapMaker) {
data.event[f.name] = f.value;
}
});
$.post($create_form.attr('action'), data, function (data) {
$.post($createForm.attr('action'), data, function (data) {
console.log(data.event);
if (data.event) {
toggleCreateForm();
@ -69,18 +69,18 @@ function ($, EventModel, UI) { return function (mapMaker) {
return false;
});
$find_form.find('button[type="submit"]').click(function (ev) {
$findForm.find('button[type="submit"]').click(function (ev) {
ev.preventDefault();
$find_form.submit();
$findForm.submit();
});
var find_when = $find_form.find('input[name="find-when"]');
find_when.blur(function(ev) { $find_form.submit() });
var $when = $findForm.find('input[name="find-when"]');
$when.blur(function(ev) { $findForm.submit() });
mmm = mapMaker;
$find_form.on("submit", function(ev) {
$findForm.on("submit", function(ev) {
ev.preventDefault();
EventModel.all(function (models) {
mapMaker.clearMarkers();
var targetDateStr = find_when[0].value;
var targetDateStr = $when[0].value;
if (!targetDateStr)
mapMaker.dropPins(models, false);
else {
@ -105,13 +105,13 @@ function ($, EventModel, UI) { return function (mapMaker) {
// setup form toggle button
function toggleCreateForm() {
var $select = $('select[name="attendees"]');
$create_form[0].reset();
$createForm[0].reset();
$select.next('.ui-select').remove();
UI.select($select);
$upload_div.find('> img').attr('src', '');
$upload_div.text($upload_div._prev_text);
$uploadDiv.find('> img').attr('src', '');
$uploadDiv.text($uploadDiv._prev_text);
$create_form.toggleClass('hidden');
$createForm.toggleClass('hidden');
$("#add-event-button").toggleClass('hidden');
}
$(".formExpandButton").click(function(ev) {
@ -137,8 +137,8 @@ function ($, EventModel, UI) { return function (mapMaker) {
}
});
$('.datepicker').datepicker().each(function(i, elem) {
$(elem).next('.icon').click(function () { $(elem).focus();});
$createForm.find('.datepicker').datepicker().each(function(i, elem) {
$(elem).next('.icon').click(function () { $(elem).focus() });
});
var $beginTime = $('[name="beginTime"]'),
$endTime = $('[name="endTime"]');
@ -149,14 +149,14 @@ function ($, EventModel, UI) { return function (mapMaker) {
.css('left', '0px');
});
$beginTime.timepicker({
appendTo: function (elem) { return $(elem).parent(); }
appendTo: function (elem) { return $(elem).parent() }
});
$endTime.timepicker({
appendTo: function (elem) { return $(elem).parent(); },
appendTo: function (elem) { return $(elem).parent() },
showDuration: true
});
EventModel.all(function (models) { mapMaker.dropPins(models); });
EventModel.all(function (models) { mapMaker.dropPins(models) });
window.scroll(0,0);
});

Просмотреть файл

@ -1,20 +1,22 @@
require.config({
deps: ['map/index'],
deps: ['map/index', 'jquery.css3finalize'],
paths: {
'html': '/js/html',
'async': '/ext/js/async',
'text': '/ext/js/text',
'jquery': '/ext/js/jquery-1.9.1',
'jquery-ui': '/ext/js/jquery-ui',
'jquery.form': '/ext/js/jquery.form',
'markdown': '/ext/js/markdown',
'to-markdown': '/ext/js/to-markdown',
'jquery-ui.datepicker': '/ext/js/jquery-ui-1.10.3.datepicker-custom',
'jquery.timepicker': '/ext/js/jquery.timepicker',
'bootstrap-markdown': '/ext/js/bootstrap-markdown',
'jquery.css3finalize': '/ext/js/jquery.css3finalize-v3.x.min',
},
shim: {
'jquery.form': ['jquery'],
'jquery-ui': ['jquery'],
'bootstrap-markdown': ['jquery', 'markdown', 'to-markdown']
'jquery-ui.datepicker': ['jquery'],
'jquery.css3finalize': ['jquery'],
'bootstrap-markdown': ['jquery', 'markdown', 'to-markdown']
}
});

Просмотреть файл

@ -15,7 +15,7 @@ define(['jquery'], function ($) {
o.fields.forEach(function (field) {
Model._fields[field] = {
get: function () { return this._data[field] },
set: function (val) { this._data[field] = val; },
set: function (val) { this._data[field] = val },
};
}, this);
} else {

Просмотреть файл

@ -21,7 +21,7 @@ module.exports = {
});
},
hasFields: function (o, fields) {
return o && fields.every(function (f) { return o[f] !== undefined; });
return o && fields.every(function (f) { return o[f] !== undefined });
},
getEnvConf: function (fields, opts) {
var prefix = opts.prefix || '', conf = {};
@ -48,7 +48,7 @@ module.exports = {
other = obj;
}
other_key = other_key || key;
Object.defineProperty(obj, key, { get: function() { return other[key]; }});
Object.defineProperty(obj, key, { get: function() { return other[key] }});
},
autoconfig: function (defs) {
var extend = this.extend.bind(this),

Просмотреть файл

@ -3,7 +3,6 @@
{% block title %}{% endblock %}
{% block head %}
<link rel="stylesheet" href="/ext/css/jquery-ui.css" />
<link rel="stylesheet" href="/css/events.css">
{% endblock %}

Просмотреть файл

@ -3,6 +3,7 @@
{% block title %}Event Map{% endblock %}
{% block head %}
{{ super() }}
<link rel="stylesheet" href="/ext/css/jquery-ui-1.10.3.custom.css" />
<link rel="stylesheet" href="/ext/css/jquery.timepicker.css">
<link rel="stylesheet" href="/ext/css/bootstrap-markdown.css">
{% endblock %}
@ -16,7 +17,7 @@
<h2><span class="icon-search"></span> Find an event</h2>
<input name="_csrf" type="hidden" value="{{ csrf_token }}" />
<input name="find-where" type="text" placeholder="Where?" />
<input name="find-when" type="date" placeholder="When?" />
<input name="find-when" type="text" placeholder="When?" class="datepicker" />
<button type="submit"><span class="icon-chevron-right"></span></button>
</form>
@ -28,7 +29,7 @@
<h2 class='formExpandButton'><span class="icon-remove"></span> Add an event</h2>
<fieldset>
<label for="title"> Name your event </label>
<span class="cell"><input name="title"
<span class="cell ui-select ui-append"><input name="title"
placeholder="Use an awesome title so people will come!" /></span>
<label for="description"> Describe your event </label>
@ -49,7 +50,7 @@
</select></div><br />
<label for="address"> Event location </label>
<span class="cell ui-input ui-append">
<span class="cell ui-select ui-append">
<input name="address" type="text" />
</span>
@ -57,7 +58,7 @@
<input name="longitude" type="hidden" />
<label for="registerLink"> Event Link </label>
<span class="cell ui-input ui-append">
<span class="cell ui-select ui-append">
<input name="registerLink" type="url"
placeholder="Link to registration page" />
</span>
@ -65,15 +66,16 @@
{% for i in ['begin','end'] %}
<label for="{{i}}Date"> Event {{i}}s </label>
<div class='datetime'>
<span class="ui-append ui-select">
<span class="ui-append ui-select select-date">
<span class="icon-calendar"></span>
<input name="{{i}}Date" type="text" class="datepicker"
placeholder="--/--/--" />
<a class="icon icon-chevron-down"></a>
</span>
<span class="ui-append ui-input">
<span class="ui-append ui-select select-time">
<input name="{{i}}Time" type="text" class="timepicker"
placeholder="--:-- --" />
placeholder="--:-- --" />
<a class="icon icon-chevron-down"></a>
</span>
</div>
{% endfor %}