1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00

Fixed date picker in chart builder

This commit is contained in:
Hillel Coren 2014-05-14 00:04:42 +03:00
parent ebac75ee4f
commit fd99dd122c
8 changed files with 32157 additions and 72 deletions

View File

@ -13,7 +13,7 @@ return array(
|
*/
'debug' => false,
'debug' => true,
/*
|--------------------------------------------------------------------------

View File

@ -39,6 +39,22 @@ class ClientApiController extends \BaseController {
//'X-Rate-Limit-Reset' - The number of seconds left in the current period,
];
/*
200 OK - Response to a successful GET, PUT, PATCH or DELETE. Can also be used for a POST that doesn't result in a creation.
201 Created - Response to a POST that results in a creation. Should be combined with a Location header pointing to the location of the new resource
204 No Content - Response to a successful request that won't be returning a body (like a DELETE request)
304 Not Modified - Used when HTTP caching headers are in play
400 Bad Request - The request is malformed, such as if the body does not parse
401 Unauthorized - When no or invalid authentication details are provided. Also useful to trigger an auth popup if the API is used from a browser
403 Forbidden - When authentication succeeded but authenticated user doesn't have access to the resource
404 Not Found - When a non-existent resource is requested
405 Method Not Allowed - When an HTTP method is being requested that isn't allowed for the authenticated user
410 Gone - Indicates that the resource at this end point is no longer available. Useful as a blanket response for old API versions
415 Unsupported Media Type - If incorrect content type was provided as part of the request
422 Unprocessable Entity - Used for validation errors
429 Too Many Requests - When a request is rejected due to rate limiting
*/
return Response::make($response, 200, $headers);
}
}

View File

@ -604,10 +604,6 @@
return invoice;
}
function toggleDatePicker(field) {
$('#'+field).datepicker('show');
}
/*
function refreshPDF() {
setTimeout(function() {

View File

@ -18,8 +18,10 @@
{{ Former::populateField('end_date', $endDate) }}
{{ Former::select('chart_type')->options($chartTypes, $chartType) }}
{{ Former::select('group_by')->options($dateTypes, $groupBy) }}
{{ Former::text('start_date') }}
{{ Former::text('end_date') }}
{{ Former::text('start_date')->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))
->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'start_date\')"></i>') }}
{{ Former::text('end_date')->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))
->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'end_date\')"></i>') }}
@if (Auth::user()->isPro())
{{ Former::actions( Button::primary_submit('Generate') ) }}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -46,6 +46,12 @@ h1 img {
h2 {
font-size: 25px;
}
h3 {
font-size: 16px;
margin-top: 0;
font-weight: 700;
font-family: Roboto, sans-serif;
}
.headline {
border-bottom: 1px solid #eee;
padding-bottom: 10px;
@ -60,7 +66,9 @@ p.first {
a,
a .cta h2,
.socicon,
.btn {
.btn,
a img
{
-webkit-transition: all .3s ease-in-out;
-moz-transition: all .3s ease-in-out;
-o-transition: all .3s ease-in-out;
@ -78,6 +86,22 @@ a:hover {
.white-bg {
background-color: #fff;
}
.form-group {
margin-bottom: 25px;
}
.form-group .glyphicon {
position: absolute;
top: 28px;
left: 15px;
display: block;
width: 50px;
height: 50px;
line-height: 50px;
text-align: center;
color: #bfbfbf;
}
.form-control.with-icon {padding-left: 50px !important;}
.navbar {
background: #211f1f;
padding: 30px 0;
@ -207,11 +231,13 @@ a .cta:hover span {
text-align: left;
color: #1a1818;
}
.hero-secure p {font-size: 20px; text-transform: uppercase; color: #fff;}
.hero-secure p img { vertical-align: baseline; padding-right: 5px;}
section.features-splash,
section.upper-footer {
margin: 70px 0;
}
section.features, section.about, section.team {
section.features, section.about, section.team, section.secure {
margin: 0;
padding: 100px 0;
}
@ -245,7 +271,7 @@ section.features.upper-footer h2.thin {
margin:0;
}
section.features4, section.team {
section.features4, section.team, .card {
background-color: #f4f3f3;
}
section.features4 .col-md-7 img {
@ -391,7 +417,7 @@ section.plans h2 {
}
section.team .col-md-3 h2 {
margin-top: 20px;
margin-bottom: 10px;
margin-bottom: 3px;
font-size: 20px;
}
section.about .screendump {
@ -405,26 +431,48 @@ section.about.white-bg .col-md-5 {
padding-right: 43px;
padding-left: 15px;
}
section.about img {
section.about img,
section.team img {
width: 100%;
min-width: 100%;
padding: 0 30px;
}
section.team .col-md-3 {
margin-top: 25px;
padding: 0 20px;
}
section.team .col-md-3 p {
font-size: 12px;
margin-bottom: 20px;
}
section.team .social {
margin: 3px 3px 0 3px;
}
section.team .social.blue {background-color: #2599c0;}
section.team .social.green {background-color: #30ab82;}
section.team .social.red {background-color: #d2462d;}
section.team .social.yellow {background-color: #ebbe09;}
section.team .social img {
margin: 8px;
margin: 12px 7px;
height: 15px;
display: inline-block;
width: auto;
min-width: 1px;
padding: 0;
}
section.team .img-team:before {
-webkit-box-shadow: inset 0 0 10px 0 rgba(255, 255, 255, 0.3);
box-shadow: inset 0 0 0 7px rgba(255, 255, 255, 0.3);
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
content: "";
}
section.team .img-team {
z-index: 1000; position: relative;
}
section.team .img-team img {}
section.contact .address .glyphicon {
background: #edd71e;
height: 40px;
@ -442,26 +490,36 @@ section.contact .address span.push {
margin-left: 55px;
line-height: 25px;
}
section.contact .form-control {
section.contact .form-control, section.secure .form-control, footer.footer .form-control {
display: block;
width: 100%;
height: 40px;
height: 50px;
padding: 6px 12px;
font-size: 14px;
line-height: 1.42857143;
color: #555;
background-color: #fff;
background-image: none;
border: none;
border: 1px solid #e0e0e1;
border-radius: 0;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-webkit-box-shadow: inset 0px 0px 8px 5px rgba(50, 50, 50, 0.25);
-moz-box-shadow: inset 0px 0px 8px 5px rgba(50, 50, 50, 0.25);
box-shadow: inset 0px 0px 5px 2px rgba(50, 50, 50, 0.05);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
section.contact textarea.form-control {
height: auto;
}
section.secure label { text-transform: uppercase; font-size: 12px; font-weight: 800; margin-bottom: 10px; display: block;}
section.secure .card {padding: 30px; margin-bottom: 50px;}
section.secure .card p {padding-top: 26px; padding-right: 15px; line-height: 50px;}
section.secure .info {padding-top: 30px;}
section.faq {
padding: 70px 0;
}
@ -477,7 +535,7 @@ section.faq .question {
margin-bottom: 30px;
border-bottom: 1px solid #e0e0e0;
}
section.faq .content {} section.faq .contact-box {
section.faq .contact-box {
padding: 20px;
text-align: center;
color: #fff;
@ -508,6 +566,15 @@ section.faq .contact-box p {
.btn-primary:hover {
background-color: #2299c0;
}
.btn.green {
background-color: #30ab82;
}
.btn.green:hover {
background-color: #2daa81;
}
.btn-lg {
font-size: 18px;
}
section.contact button span.glyphicon {
background-color: transparent;
color: #fff;
@ -527,7 +594,8 @@ section.contact .btn span.glyphicon {
section.contact .btn:hover span.glyphicon {
font-size: 25px;
}
section.contact textarea:focus,
section.contact textarea:focus, section.secure textarea:focus,
select:focus,
input[type=text]:focus,
input[type=password]:focus,
input[type=datetime]:focus,
@ -543,54 +611,94 @@ input[type=search]:focus,
input[type=tel]:focus,
input[type=color]:focus,
.uneditable-input:focus {
border-color: rgba(0, 0, 0, 0.8);
outline: 0;
outline: thin dotted \9;
/* IE6-9 */
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0), 0 0 8px rgba(0, 0, 0, .2) !important;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0), 0 0 8px rgba(0, 0, 0, .2) !important;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0), 0 0 8px rgba(0, 0, 0, .2) !important;
}
section.contact address {
display: inline-block;
}
footer .navbar-inner {
float: right;
footer.footer {
background: #211f1f;
padding: 50px 0;
text-align: center;
}
footer ul.navbar-list {
footer.footer h3 { text-align: left; color: #fff; padding-bottom: 12px; margin-bottom: 25px; border-bottom: 1px solid #2c2a2a;}
footer.footer hr {
margin-top: 25px;
margin-bottom: 25px;
border: 0;
border-top: 1px solid #2c2a2a;
}
footer.footer .glyphicon {margin-right: 8px; color: #ebbe09; width: 15px; font-size: 14px;}
footer ul.navbar-vertical {
margin: 0;
padding: 0;
margin-bottom: 30px;
}
footer ul.navbar-vertical li {
display: block;
padding: 2px 0;
}
footer ul.navbar-vertical li a {
color: #a3a2a2;
font-size: 12px;
font-weight: 800;
text-transform: uppercase;
}
footer ul.navbar-vertical li a:hover {
color: #e5e5e5;
}
footer.footer .social {
margin-bottom: 30px;
width: 100%;
clear: both;
text-align: center;
}
footer ul.navbar-list:last-child {
margin-top: 5px;
footer.footer .social img {
margin: 0 3px;
}
footer ul.navbar-list:last-child li {
font-size: 12px;
footer.footer .social a img:hover {
opacity: 0.6;
}
footer ul.navbar-list:last-child li {
font-size: 12px;
footer.footer .social .row1 {
margin-bottom: -8px;
}
footer ul.navbar-list:last-child li:last-child a {
color: #fff;
footer.footer form#newsletter button {
position: absolute;
right: 0;
top: 0;
width: 50px;
height: 50px;
background: #b7b7b6;
border: none;
padding: 0;
border-radius: 0;
text-align: center;
margin-bottom: 30px;
}
footer .social {
float: left;
footer.footer form#newsletter button:hover {
background: #7b7a79;
}
footer .social .socicon {
font-family: socicon !important;
font-size: 25px;
margin-right: 8px;
}
footer .social .socicon {
color: #fff;
}
footer .social .socicon:hover {
color: #edd71e;
}
footer .social p {
font-size: 12px;
font-family: Roboto, sans-serif;
footer.footer form#newsletter button .glyphicon {
position: static;
color: #fff;
font-size: 15px;
width: auto;
margin: 0;
}
footer.footer form#newsletter .form-group {
position: relative;
}
footer.footer form#newsletter input {
padding: right: 60px;
background: #393636;
border: none;
color: #b7b7b6;
}
@media (max-width: 768px) {
h1 {
font-size: 30px;
@ -601,9 +709,6 @@ footer .social p {
section.about .col-md-5 {
padding-left: 15px !important;
}
section.about.white-bg .col-md-5 {
padding-right: 15px !important;
}
.navbar {
text-align: center;
padding: 25px 0 18px;
@ -639,10 +744,6 @@ footer .social p {
min-height: 1px;
padding: 50px 0;
}
section.features,
section.upper-footer {
margin: 30px 0;
}
section.upper-footer.white-bg {
padding: 30px 0;
}
@ -650,10 +751,22 @@ footer .social p {
margin-bottom: 10px;
}
section.features, section.blue, section {
section.features, section.blue, section, section.secure, section.about, section.team, section.contact {
padding: 40px 0;
margin: 0 !important;
}
section.secure .info {
padding-top: 0;
}
section.secure .card {
padding: 15px;
margin-bottom: 40px;
}
section.secure .card p {
padding-top: 0;
padding-right: 15px;
line-height: 1;
}
section.blue h1 {
line-height: 1.2;
margin-bottom: 20px;
@ -708,13 +821,6 @@ float: none;
display: block;
text-transform: lowercase;
}
section.about {
padding: 30px 0;
text-align: center;
}
section.about.contact {
padding: 30px 0 0;
}
section.contact .address {
margin: 0;
}

View File

@ -1731,4 +1731,9 @@ function setDocHexDraw(doc, hex) {
function openUrl(url, track) {
trackUrl(track ? track : url);
window.open(url, '_blank');
}
}
function toggleDatePicker(field) {
$('#'+field).datepicker('show');
}