New style partially complete

This commit is contained in:
2012-12-12 15:32:03 -05:00
parent 86ee45c184
commit 14d8054f22
85 changed files with 10261 additions and 1081 deletions
Binary file not shown.
Binary file not shown.
+26 -447
View File
@@ -1,466 +1,45 @@
body
body {
padding-top: 49px;
}
#content {
padding: .5em 1em;
}
.brand
{
background-image: url('/Content/images/Background.png');
background-repeat: repeat-x;
background-color: #b4eff6;
font-size: 85%;
font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
margin: 0;
padding: 0;
color: #696969;
background: url(images/Header.png) no-repeat left center;
height: 28px;
width: 266px;
}
a:link {
color: #2f3569;
text-decoration: underline;
.navbar .brand {
margin-left: 20px;
margin-right: -20px;
}
a:visited {
color: #1f2346;
text-decoration: underline;
.nav li {
line-height: 29px;
}
a:hover {
color: #b76d00;
text-decoration: none;
}
a:active {
color: #d57f00;
}
p, ul {
margin-bottom: 20px;
line-height: 1.6em;
}
header,
footer,
nav,
section {
display: block;
}
/* HEADINGS
----------------------------------------------------------*/
h1, h2, h3, h4, h5, h6 {
font-size: 1.5em;
color: #000;
}
h1 {
font-size: 2em;
padding-bottom: 0;
margin-bottom: 0;
}
h2 {
padding: 0 0 5px 0;
}
h3 {
font-size: 1.2em;
}
h4 {
font-size: 1.1em;
}
h5, h6 {
font-size: 1em;
}
/* PRIMARY LAYOUT ELEMENTS
----------------------------------------------------------*/
/* you can specify a greater or lesser percentage for the
page width. Or, you can specify an exact pixel width. */
.page {
width: 90%;
margin-left: auto;
margin-right: auto;
}
header, #header {
position: relative;
margin-bottom: 0;
color: #000;
padding: 0;
}
header h1, #header h1 {
font-weight: bold;
padding: 5px 0;
margin: 0;
color: #fff;
border: none;
line-height: 2em;
font-size: 32px !important;
}
#header h1 a
{
color: #fff;
text-decoration: none;
}
#main
{
clear: both;
padding: 30px 30px 15px 30px;
background-color: #fff;
border-radius: 4px 0 0 0;
-webkit-border-radius: 4px 0 0 0;
-moz-border-radius: 4px 0 0 0;
}
footer,
#footer {
background-color: #777;
color: #444;
padding: 10px 0;
footer {
background-color: #101010;
color: #666;
text-align: center;
line-height: normal;
margin: 0 0 30px 0;
font-size: .9em;
border-radius: 0 0 4px 4px;
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
}
/* TAB MENU
----------------------------------------------------------*/
ul#menu {
border-bottom: 1px #73acb3 solid;
padding: 0 0 2px;
position: relative;
margin: 0;
text-align: right;
}
ul#menu li {
display: inline;
list-style: none;
}
ul#menu li#greeting {
padding: 10px 20px;
font-weight: bold;
text-decoration: none;
line-height: 2.8em;
color: #fff;
}
ul#menu li a {
padding: 10px 20px;
font-weight: bold;
text-decoration: none;
line-height: 2.8em;
background-color: #d0d9c2;
color: #d57f00;
border-radius: 4px 4px 0 0;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
}
ul#menu li a:hover {
background-color: #f1fff8;
text-decoration: none;
}
ul#menu li a:active {
background-color: #f1fff8;
text-decoration: none;
}
ul#menu li.selected a {
background-color: #fff;
color: #000;
}
/* FORM LAYOUT ELEMENTS
----------------------------------------------------------*/
fieldset
{
border: 2px solid #81B3B3;
width: 675px;
padding: 0 1.4em 1.4em 1.4em;
margin-right: auto;
}
legend {
font-size: 1.2em;
font-weight: bold;
}
textarea {
min-height: 75px;
}
input[type="text"],
input[type="password"] {
border: 1px solid #ccc;
color: #444;
width: 200px;
width: 100px;
}
select {
border: 1px solid #ccc;
padding: 2px;
color: #444;
}
/* TABLE
----------------------------------------------------------*/
table {
border: solid 1px #e4f2f2;
border-collapse: collapse;
}
table td {
padding: 4px;
border: solid 1px #e4f2f2;
}
table th {
padding: 6px 4px;
text-align: left;
background-color: #e4f2f2;
border: solid 1px #e4f2f2;
.qtip-content dt {
line-height: 10px;
width: 110px;
}
tbody td:nth-of-type(odd),
tbody tr:nth-of-type(odd) {
background:#e8eef4;
background:rgba(232, 238, 244, 0.25);
}
table tfoot td {
background-color: #e4f2f2;
border: solid 1px #e4f2f2;
}
/* MISC
----------------------------------------------------------*/
.clear {
clear: both;
}
.error {
color: Red;
}
nav,
#menucontainer {
margin-top: 5px;
clear: both;
float: left;
}
div#title {
display: block;
float: left;
text-align: left;
}
div#title a
{
border-width: 0;
}
form#filter
{
display: inline-block;
}
div#newLog
{
display: inline-block;
}
/* Styles for validation helpers
-----------------------------------------------------------*/
.field-validation-error {
color: #AA5755;
display: block;
}
.field-validation-valid {
display: none;
}
.input-validation-error {
border: 1px solid #6E1E1C;
background-color: #F3E2E2;
}
.validation-summary-errors {
font-weight: bold;
color: #ff0000;
}
.validation-summary-valid {
display: none;
}
/* Styles for editor and display helpers
----------------------------------------------------------*/
.display-field-container, .editor-field-container
{
display: inline-block;
vertical-align: top;
padding-right: 15px;
padding-bottom: 10px;
}
.display-label,
.editor-label
{
color: #7F6F50;
margin: 1em 0 0 0;
}
.display-field,
.editor-field {
margin: 0.5em 0 0 0;
font-weight: bold;
}
.text-box {
width: 30em;
}
.text-box.multi-line {
height: 6.5em;
}
.tri-state {
width: 6em;
}
.format-hint
{
color: #806F50;
font-size: .8em;
font-style: italic;
margin-top: 2px;
padding-left: 5px;
}
/* Input types */
.vehicleId input
{
width: 60px;
}
.endOdometer input
{
width: 60px;
}
.gasPurchased input
{
width: 45px;
}
.date input
{
width: 70px;
}
.units
{
font-size: .9em;
}
.employeeName input
{
width: 135px;
}
.cityName input
{
width: 125px;
}
.logType .radiobutton
{
display: block;
}
.modelYear input
{
width: 40px;
}
.make input
{
width: 80px
}
.key input
{
width: 30px
}
.model input
{
width: 80px
}
.vin input
{
width: 150px
}
.report-miles
{
text-decoration: underline;
.qtip-content dd {
line-height: 10px;
margin-left: 120px;
}
.report-calculation
{
display: none;
}
.report-calculation table
{
width: 100%;
}
.ui-icon
{
display: inline-block !important;
}
.qtip-content h5
{
margin-top: 3px;
margin-bottom: 3px;
}
.qtip-content p
{
margin-top: 3px;
margin-bottom: 3px;
}
.ui-message
{
display: block;
margin-top: 10px;
padding: 3px;
}
@media print {
#header,
#footer,
.no-print
{ display:none }
}
+465
View File
@@ -0,0 +1,465 @@
body
{
background-image: url('/Content/images/Background.png');
background-repeat: repeat-x;
background-color: #b4eff6;
font-size: 85%;
font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
margin: 0;
padding: 0;
color: #696969;
}
a:link {
color: #2f3569;
text-decoration: underline;
}
a:visited {
color: #1f2346;
text-decoration: underline;
}
a:hover {
color: #b76d00;
text-decoration: none;
}
a:active {
color: #d57f00;
}
p, ul {
margin-bottom: 20px;
line-height: 1.6em;
}
header,
footer,
nav,
section {
display: block;
}
/* HEADINGS
----------------------------------------------------------*/
h1, h2, h3, h4, h5, h6 {
font-size: 1.5em;
color: #000;
}
h1 {
font-size: 2em;
padding-bottom: 0;
margin-bottom: 0;
}
h2 {
padding: 0 0 5px 0;
}
h3 {
font-size: 1.2em;
}
h4 {
font-size: 1.1em;
}
h5, h6 {
font-size: 1em;
}
/* PRIMARY LAYOUT ELEMENTS
----------------------------------------------------------*/
/* you can specify a greater or lesser percentage for the
page width. Or, you can specify an exact pixel width. */
.page {
width: 90%;
margin-left: auto;
margin-right: auto;
}
header, #header {
position: relative;
margin-bottom: 0;
color: #000;
padding: 0;
}
header h1, #header h1 {
font-weight: bold;
padding: 5px 0;
margin: 0;
color: #fff;
border: none;
line-height: 2em;
font-size: 32px !important;
}
#header h1 a
{
color: #fff;
text-decoration: none;
}
#main
{
clear: both;
padding: 30px 30px 15px 30px;
background-color: #fff;
border-radius: 4px 0 0 0;
-webkit-border-radius: 4px 0 0 0;
-moz-border-radius: 4px 0 0 0;
}
footer,
#footer {
background-color: #777;
color: #444;
padding: 10px 0;
text-align: center;
line-height: normal;
margin: 0 0 30px 0;
font-size: .9em;
border-radius: 0 0 4px 4px;
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
}
/* TAB MENU
----------------------------------------------------------*/
ul#menu {
border-bottom: 1px #73acb3 solid;
padding: 0 0 2px;
position: relative;
margin: 0;
text-align: right;
}
ul#menu li {
display: inline;
list-style: none;
}
ul#menu li#greeting {
padding: 10px 20px;
font-weight: bold;
text-decoration: none;
line-height: 2.8em;
color: #fff;
}
ul#menu li a {
padding: 10px 20px;
font-weight: bold;
text-decoration: none;
line-height: 2.8em;
background-color: #d0d9c2;
color: #d57f00;
border-radius: 4px 4px 0 0;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
}
ul#menu li a:hover {
background-color: #f1fff8;
text-decoration: none;
}
ul#menu li a:active {
background-color: #f1fff8;
text-decoration: none;
}
ul#menu li.selected a {
background-color: #fff;
color: #000;
}
/* FORM LAYOUT ELEMENTS
----------------------------------------------------------*/
fieldset
{
border: 2px solid #81B3B3;
width: 675px;
padding: 0 1.4em 1.4em 1.4em;
margin-right: auto;
}
legend {
font-size: 1.2em;
font-weight: bold;
}
textarea {
min-height: 75px;
}
input[type="text"],
input[type="password"] {
border: 1px solid #ccc;
color: #444;
width: 200px;
width: 100px;
}
select {
border: 1px solid #ccc;
padding: 2px;
color: #444;
}
/* TABLE
----------------------------------------------------------*/
table {
border: solid 1px #e4f2f2;
border-collapse: collapse;
}
table td {
padding: 4px;
border: solid 1px #e4f2f2;
}
table th {
padding: 6px 4px;
text-align: left;
background-color: #e4f2f2;
border: solid 1px #e4f2f2;
}
tbody td:nth-of-type(odd),
tbody tr:nth-of-type(odd) {
background:#e8eef4;
background:rgba(232, 238, 244, 0.25);
}
table tfoot td {
background-color: #e4f2f2;
border: solid 1px #e4f2f2;
}
/* MISC
----------------------------------------------------------*/
.clear {
clear: both;
}
.error {
color: Red;
}
nav,
#menucontainer {
margin-top: 5px;
clear: both;
float: left;
}
div#title {
display: block;
float: left;
text-align: left;
}
div#title a
{
border-width: 0;
}
form#filter
{
display: inline-block;
}
div#newLog
{
display: inline-block;
}
/* Styles for validation helpers
-----------------------------------------------------------*/
.field-validation-error {
color: #AA5755;
display: block;
}
.field-validation-valid {
display: none;
}
.input-validation-error {
border: 1px solid #6E1E1C;
background-color: #F3E2E2;
}
.validation-summary-errors {
font-weight: bold;
color: #ff0000;
}
.validation-summary-valid {
display: none;
}
/* Styles for editor and display helpers
----------------------------------------------------------*/
.display-field-container, .editor-field-container
{
display: inline-block;
vertical-align: top;
padding-right: 15px;
padding-bottom: 10px;
}
.display-label,
.editor-label
{
color: #7F6F50;
margin: 1em 0 0 0;
}
.display-field,
.editor-field {
margin: 0.5em 0 0 0;
font-weight: bold;
}
.text-box {
width: 30em;
}
.text-box.multi-line {
height: 6.5em;
}
.tri-state {
width: 6em;
}
.format-hint
{
color: #806F50;
font-size: .8em;
font-style: italic;
margin-top: 2px;
padding-left: 5px;
}
/* Input types */
.vehicleId input
{
width: 60px;
}
.endOdometer input
{
width: 60px;
}
.gasPurchased input
{
width: 45px;
}
.date input
{
width: 70px;
}
.units
{
font-size: .9em;
}
.employeeName input
{
width: 135px;
}
.cityName input
{
width: 125px;
}
.logType .radiobutton
{
display: block;
}
.modelYear input
{
width: 40px;
}
.make input
{
width: 80px
}
.key input
{
width: 30px
}
.model input
{
width: 80px
}
.vin input
{
width: 150px
}
.report-miles
{
text-decoration: underline;
}
.report-calculation
{
display: none;
}
.report-calculation table
{
width: 100%;
}
.ui-icon
{
display: inline-block !important;
}
.qtip-content h5
{
margin-top: 3px;
margin-bottom: 3px;
}
.qtip-content p
{
margin-top: 3px;
margin-bottom: 3px;
}
.ui-message
{
display: block;
margin-top: 10px;
padding: 3px;
}
@media print {
#header,
#footer,
.no-print
{ display:none }
}
+16 -247
View File
@@ -1,254 +1,23 @@
body
body {
padding-top: 49px;
}
#content {
padding: .5em 1em;
}
.brand
{
font-size: 75%;
font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
color: #232323;
background-color: #fff;
background: url(images/Header.png) no-repeat left center;
height: 28px;
width: 266px;
}
#header
{
width: 452px;
margin-left: auto;
margin-right: auto;
}
input[type="radio"]
{
margin-left: 3px;
}
h4
{
color: #366;
margin: 3px;
}
/* TABLE
----------------------------------------------------------*/
table {
border: solid 1px #e4f2f2;
border-collapse: collapse;
}
table td {
padding: 4px;
border: solid 1px #e4f2f2;
}
table th
{
color: #7F6F50;
padding: 6px 4px;
text-align: left;
background-color: #e4f2f2;
border: solid 1px #e4f2f2;
}
tbody td:nth-of-type(odd),
tbody tr:nth-of-type(odd) {
background:#e4f2f2;
background:rgba(228,242,242, 0.25);
}
table tfoot td {
background-color: #e4f2f2;
border: solid 1px #e4f2f2;
}
/* Styles for basic forms http://colorschemedesigner.com/#3i31Sg0llw0w0
-----------------------------------------------------------*/
fieldset
{
border:2px solid #81B3B3;
padding:0 1.4em 1.4em 1.4em;
margin:0 0 1.5em 0;
}
legend
{
color: #366;
font-size:1.2em;
font-weight: bold;
}
textarea
{
min-height: 75px;
}
.editor-label
{
color: #7F6F50;
margin: 1em 0 0 0;
font-weight: bold;
}
.editor-field
{
margin:0.2em 0 0 0;
}
.display-label
{
color: #7F6F50;
margin: 1em 0 0 0;
font-weight: bold;
}
.display-field
{
margin:0.2em 0 0 0;
}
/* Styles for validation helpers
-----------------------------------------------------------*/
.field-validation-error
{
color: #AA5755;
display: block;
}
.field-validation-valid
{
display: none;
}
.input-validation-error
{
border: 1px solid #6E1E1C;
background-color: #F3E2E2;
}
.validation-summary-errors
{
font-weight: bold;
color: #AA5755;
}
.validation-summary-valid
{
display: none;
}
/* Input types */
.vehicleId input
{
width: 60px;
}
.endOdometer input
{
width: 60px;
}
.gasPurchased input
{
width: 45px;
}
.date input
{
width: 70px;
}
.units
{
font-size: .9em;
}
.employeeName input
{
width: 135px;
}
.cityName input
{
width: 125px;
}
.logType .radiobutton
{
display: block;
}
/* Errors */
.vehicle-id .field-validation-error
{
width: 60px;
}
.odometer .field-validation-error
{
width: 80px;
}
.gas .field-validation-error
{
width: 45px;
}
.date .field-validation-error
{
width: 70px;
}
.employeeName .field-validation-error
{
width: 135px;
}
.cityName .field-validation-error
{
width: 125px;
}
/* hint! */
.format-hint
{
color: #806F50;
font-size: .8em;
font-style: italic;
margin-top: 2px;
padding-left: 5px;
}
.subscript
{
font-size: .8em;
font-style: italic;
}
.warning
{
background-color: yellow;
}
span#icon-employee-history
{
position: relative;
display: inline-block;
left: -20px;
bottom: -3px;
.navbar .brand {
margin-left: 20px;
margin-right: -20px;
}
.transparent {
opacity: 0.1;
.nav li {
line-height: 29px;
}
.loading {
background-image: url('/Content/images/spinner.gif');
background-repeat: no-repeat;
background-position: right;
padding-right: 20px;
}
+254
View File
@@ -0,0 +1,254 @@
body
{
font-size: 75%;
font-family: "lucida grande",tahoma,verdana,arial,sans-serif;
color: #232323;
background-color: #fff;
}
#header
{
width: 452px;
margin-left: auto;
margin-right: auto;
}
input[type="radio"]
{
margin-left: 3px;
}
h4
{
color: #366;
margin: 3px;
}
/* TABLE
----------------------------------------------------------*/
table {
border: solid 1px #e4f2f2;
border-collapse: collapse;
}
table td {
padding: 4px;
border: solid 1px #e4f2f2;
}
table th
{
color: #7F6F50;
padding: 6px 4px;
text-align: left;
background-color: #e4f2f2;
border: solid 1px #e4f2f2;
}
tbody td:nth-of-type(odd),
tbody tr:nth-of-type(odd) {
background:#e4f2f2;
background:rgba(228,242,242, 0.25);
}
table tfoot td {
background-color: #e4f2f2;
border: solid 1px #e4f2f2;
}
/* Styles for basic forms http://colorschemedesigner.com/#3i31Sg0llw0w0
-----------------------------------------------------------*/
fieldset
{
border:2px solid #81B3B3;
padding:0 1.4em 1.4em 1.4em;
margin:0 0 1.5em 0;
}
legend
{
color: #366;
font-size:1.2em;
font-weight: bold;
}
textarea
{
min-height: 75px;
}
.editor-label
{
color: #7F6F50;
margin: 1em 0 0 0;
font-weight: bold;
}
.editor-field
{
margin:0.2em 0 0 0;
}
.display-label
{
color: #7F6F50;
margin: 1em 0 0 0;
font-weight: bold;
}
.display-field
{
margin:0.2em 0 0 0;
}
/* Styles for validation helpers
-----------------------------------------------------------*/
.field-validation-error
{
color: #AA5755;
display: block;
}
.field-validation-valid
{
display: none;
}
.input-validation-error
{
border: 1px solid #6E1E1C;
background-color: #F3E2E2;
}
.validation-summary-errors
{
font-weight: bold;
color: #AA5755;
}
.validation-summary-valid
{
display: none;
}
/* Input types */
.vehicleId input
{
width: 60px;
}
.endOdometer input
{
width: 60px;
}
.gasPurchased input
{
width: 45px;
}
.date input
{
width: 70px;
}
.units
{
font-size: .9em;
}
.employeeName input
{
width: 135px;
}
.cityName input
{
width: 125px;
}
.logType .radiobutton
{
display: block;
}
/* Errors */
.vehicle-id .field-validation-error
{
width: 60px;
}
.odometer .field-validation-error
{
width: 80px;
}
.gas .field-validation-error
{
width: 45px;
}
.date .field-validation-error
{
width: 70px;
}
.employeeName .field-validation-error
{
width: 135px;
}
.cityName .field-validation-error
{
width: 125px;
}
/* hint! */
.format-hint
{
color: #806F50;
font-size: .8em;
font-style: italic;
margin-top: 2px;
padding-left: 5px;
}
.subscript
{
font-size: .8em;
font-style: italic;
}
.warning
{
background-color: yellow;
}
span#icon-employee-history
{
position: relative;
display: inline-block;
left: -20px;
bottom: -3px;
margin-right: -20px;
}
.transparent {
opacity: 0.1;
}
.loading {
background-image: url('/Content/images/spinner.gif');
background-repeat: no-repeat;
background-position: right;
padding-right: 20px;
}
+28 -28
View File
@@ -1,84 +1,84 @@
.White
{
color:Gray;
background-color: White;
color:Gray !important;
background-color: White !important;
}
.Gold
{
color:Black;
background-color: #E8D138;
color:Black !important;
background-color: #E8D138 !important;
}
.Maroon
{
color:White;
background-color: #800000;
color:White !important;
background-color: #800000 !important;
}
.Green
{
color:White;
background-color: #008000;
color:White !important;
background-color: #008000 !important;
}
.Black
{
color:White;
background-color: Black;
color:White !important;
background-color: Black !important;
}
.Blue
{
color:White;
background-color: #0000D0;
color:White !important;
background-color: #0000D0 !important;
}
.DkBlue
{
color:White;
background-color: #000080;
color:White !important;
background-color: #000080 !important;
}
.Purple
{
color:White;
background-color: Purple;
color:White !important;
background-color: Purple !important;
}
.Beige
{
color: Black;
background-color: #F5F5DC;
color: Black !important;
background-color: #F5F5DC !important;
}
.Silver,.SilverIce
{
color: Black;
background-color: #C0C0C0;
color: Black !important;
background-color: #C0C0C0 !important;
}
.Burgundy, .Burgandy
{
color: White;
background-color: #900020;
color: White !important;
background-color: #900020 !important;
}
.Brown
{
color: White;
background-color: rgb(111, 81, 0);
color: White !important;
background-color: rgb(111, 81, 0) !important;
}
.Red
{
color: White;
background-color: Red;
color: White !important;
background-color: Red !important;
}
.Unknown
{
color: Black;
background-image: url('/Content/images/Rainbow.png');
color: Black !important;
background-image: url('/Content/images/Rainbow.png') !important;
}
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
+5893
View File
File diff suppressed because it is too large Load Diff
+9
View File
File diff suppressed because one or more lines are too long
Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 384 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

+34 -99
View File
@@ -1,7 +1,7 @@
/*! jQuery UI - v1.9.2 - 2012-12-07
/*! jQuery UI - v1.9.2 - 2012-12-09
* http://jqueryui.com
* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.tooltip.css
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=d0d9c2&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=aaa&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=2f3569&iconColorDefault=000000&bgColorHover=f0f0f0&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=9e9e9e&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=b8c5aa&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
* Includes: jquery.ui.core.css, jquery.ui.autocomplete.css, jquery.ui.datepicker.css, jquery.ui.menu.css
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande%2CLucida%20Sans%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
* Copyright (c) 2012 jQuery Foundation and other contributors Licensed MIT */
/* Layout helpers
@@ -32,17 +32,7 @@
/* Overlays */
.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
.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-autocomplete {
.ui-autocomplete {
position: absolute;
top: 0;
left: 0;
@@ -51,36 +41,6 @@
/* workarounds */
* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; }
.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
.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: 1.4; }
.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; }
.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 */
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
@@ -137,19 +97,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
left: -4px; /*must have*/
width: 200px; /*must have*/
height: 200px; /*must have*/
}.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; }
.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; }
.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; 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: 14px; height: 14px; right: 3px; bottom: 3px; }
.ui-draggable .ui-dialog-titlebar { cursor: move; }
.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; }
}.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; zoom: 1; width: 100%; }
.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
@@ -169,46 +117,33 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
/* right-aligned */
.ui-menu .ui-menu-icon { position: static; float: right; }
.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;
}
/* Fades and background-images don't work well together in IE6, drop the image */
* html .ui-tooltip {
background-image: none;
}
body .ui-tooltip { border-width: 2px; }
/* Component containers
----------------------------------*/
.ui-widget { font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 1.1em; }
.ui-widget { font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
.ui-widget-content a { color: #333333; }
.ui-widget-header { border: 1px solid #aaa; background: #d0d9c2 url(images/ui-bg_gloss-wave_35_d0d9c2_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; }
.ui-widget-content a { color: #222222; }
.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
.ui-widget-header a { color: #ffffff; }
/* Interaction states
----------------------------------*/
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2f3569; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2f3569; text-decoration: none; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #9e9e9e; background: #f0f0f0 url(images/ui-bg_glass_100_f0f0f0_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #c77405; text-decoration: none; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #b8c5aa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; }
.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #1d5987; text-decoration: none; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 url(images/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #e17009; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; text-decoration: none; }
/* Interaction Cues
----------------------------------*/
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fad42e; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; color: #363636; }
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
.ui-state-error, .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; color: #cd0a0a; }
.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
@@ -218,14 +153,14 @@ body .ui-tooltip { border-width: 2px; }
----------------------------------*/
/* states and images */
.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
.ui-state-default .ui-icon { background-image: url(images/ui-icons_000000_256x240.png); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
.ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); }
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); }
.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_469bdd_256x240.png); }
.ui-widget-content .ui-icon {background-image: url(images/ui-icons_469bdd_256x240.png); }
.ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); }
.ui-state-default .ui-icon { background-image: url(images/ui-icons_6da8d5_256x240.png); }
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_217bc0_256x240.png); }
.ui-state-active .ui-icon {background-image: url(images/ui-icons_f9bd01_256x240.png); }
.ui-state-highlight .ui-icon {background-image: url(images/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); }
/* positioning */
.ui-icon-carat-1-n { background-position: 0 0; }
@@ -409,11 +344,11 @@ body .ui-tooltip { border-width: 2px; }
----------------------------------*/
/* Corner radius */
.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -khtml-border-top-left-radius: 5px; border-top-left-radius: 5px; }
.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -khtml-border-top-right-radius: 5px; border-top-right-radius: 5px; }
.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -khtml-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; -khtml-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
/* Overlays */
.ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .5;filter:Alpha(Opacity=50); }
.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .2;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }
.ui-widget-overlay { background: #aaaaaa url(images/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; opacity: .3;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
File diff suppressed because one or more lines are too long
+5 -2
View File
@@ -56,10 +56,13 @@ namespace MileageTraker.Web
metadata.DisplayName = propertyName.Wordify();
var formatHint = attributes.OfType<FormatHintAttribute>().FirstOrDefault();
metadata.AdditionalValues.Add("FormatHint", formatHint != null ? formatHint.Text : (string)null);
metadata.AdditionalValues.Add("FormatHint", formatHint != null ? formatHint.Text : null);
var unitsAttribute = attributes.OfType<UnitsAttribute>().FirstOrDefault();
metadata.AdditionalValues.Add("Units", unitsAttribute != null ? unitsAttribute.Text : (string)null);
metadata.AdditionalValues.Add("Units", unitsAttribute != null ? unitsAttribute.Text : null);
var inputSizeAttribute = attributes.OfType<InputSizeAttribute>().FirstOrDefault();
metadata.AdditionalValues.Add("InputSize", inputSizeAttribute != null ? inputSizeAttribute.ClassName : null);
var editLabelAttribute = attributes.OfType<NoEditLabelAttribute>().FirstOrDefault();
metadata.AdditionalValues.Add("EditLabel", editLabelAttribute == null);
+6
View File
@@ -17,12 +17,14 @@ namespace MileageTraker.Web.Models
[Remote("Exists", "Vehicle", ErrorMessage = "ID not found")]
[StringLength(6, MinimumLength = 4, ErrorMessage = "Enter 4 digit number")]
[Display(Name = "Vehicle ID")]
[InputSize("mini")]
[RegularExpression(@"\d+", ErrorMessage = "Enter only numbers")]
public string VehicleId { get; set; }
[Required]
[Range(1, 500000, ErrorMessage = "Between 1 and 500k")]
[Display(Name = "End Odometer")]
[InputSize("small")]
[Units("Miles")]
public int EndOdometer { get; set; }
@@ -33,17 +35,20 @@ namespace MileageTraker.Web.Models
[Required]
[StringLength(64, MinimumLength = 3, ErrorMessage = "Minimum 3 characters")]
[InputSize("medium")]
public string CityName { get; set; }
[Required]
[Display(Name = "Employee / Driver")]
[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
[InputSize("medium")]
public string EmployeeName { get; set; }
[Range(0, 50)]
[DisplayFormat(DataFormatString = "{0:0.000}", ApplyFormatInEditMode = true)]
[Units("Gallons")]
[FormatHint("n.nnnn")]
[InputSize("mini")]
public double GasPurchased { get; set; }
[Required]
@@ -51,6 +56,7 @@ namespace MileageTraker.Web.Models
[DisplayFormat(DataFormatString = @"{0:MM/dd/yyyy}", ApplyFormatInEditMode = true)]
[DenyFutureDate(ErrorMessage = "Future date")]
[FormatHint("mm/dd/yyyy")]
[InputSize("small")]
public DateTime Date { get; set; }
[Display(Name = "Time Created")]
+14
View File
@@ -7,6 +7,7 @@ namespace MileageTraker.Web.Models
public class Vehicle
{
[Required]
[InputSize("mini")]
public int Key { get; set; }
[Key]
@@ -14,36 +15,46 @@ namespace MileageTraker.Web.Models
[StringLength(6, MinimumLength = 4, ErrorMessage = "Must be at least a 4 digit number")]
[Display(Name = "EHTRA ID")]
[RegularExpression(@"\d+", ErrorMessage = "Vehicle ID must be all numbers")]
[InputSize("mini")]
public string VehicleId { get; set; }
[Required]
[RegularExpression(@"\d{4}", ErrorMessage = "Must be 4 numbers")]
[InputSize("mini")]
public string ModelYear { get; set; }
[Required]
[InputSize("medium")]
public string Make { get; set; }
[Display(Name = "Model")]
[Required]
[InputSize("medium")]
public string CarModel { get; set; }
[InputSize("small")]
public string Color { get; set; }
[Required]
[RegularExpression(@"Car|Truck|SUV|Van", ErrorMessage = "Must be Car, Truck, SUV, or Van")]
[FormatHint("Car, Truck, SUV or Van")]
[InputSize("mini")]
public string Type { get; set; }
[Required]
[Display(Name = "VIN")]
[RegularExpression(@"[0-9A-HJ-NPR-Z]{17}", ErrorMessage = "VIN must be 17-characters, not including letters I, O or Q")]
[InputSize("large")]
public string Vin { get; set; }
[Required]
[InputSize("small")]
public decimal Price { get; set; }
[Required]
[RegularExpression(@"\d{1,2}/\d{2}", ErrorMessage = "PurDate must be in mm/yy format")]
[InputSize("small")]
[FormatHint("mm/yy")]
public string PurDate { get; set; }
[Required]
@@ -51,16 +62,19 @@ namespace MileageTraker.Web.Models
public string TagNumber { get; set; }
[Required]
[InputSize("small")]
public string Prog { get; set; }
[RegularExpression(@"Unassigned|[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Please enter the full name")]
[DisplayFormat(NullDisplayText = "Unassigned")]
public string Assigned { get; set; }
[InputSize("medium")]
public string Notes { get; set; }
[Display(Name = "Current Odometer", ShortName= "ODO")]
[DisplayFormat(NullDisplayText = "?")]
[InputSize("small")]
public int? CurrentOdometer { get; set; }
public virtual ICollection<Log> Logs { get; set; }
+45 -48
View File
@@ -54,28 +54,30 @@
});
});
$("a.qtip-modal").each(function () { bindQtipModal($(this)); });
if ($("input#EmployeeName").length > 0) {
$("input#EmployeeName").after('<span id="icon-employee-history" class="ui-icon ui-icon-search transparent"/>');
$("input#EmployeeName")
.after('<span id="icon-employee-history" class="add-on"><i class="icon-search" /></span>')
.add('#icon-employee-history')
.wrapAll('<div class="input-append"></div>');
function employeeHistoryKeydownHandler(data) {
employeeHistoryIconUpdate($(data.target), $("#icon-employee-history"));
}
function employeeHistoryKeydownHandler(data) {
employeeHistoryIconUpdate($(data.target), $("#icon-employee-history"));
}
function employeeHistoryIconUpdate($input, $icon) {
if (!$input.hasClass("input-validation-error") // not invalid
function employeeHistoryIconUpdate($input, $icon) {
if (!$input.hasClass("input-validation-error") // not invalid
&& $input.attr("value").length > 0) // has text
$icon.removeClass("transparent");
else
$icon.addClass("transparent");
}
$icon.removeClass("transparent");
else
$icon.addClass("transparent");
}
$("input#EmployeeName").change(employeeHistoryKeydownHandler).keydown(employeeHistoryKeydownHandler);
$("input#EmployeeName").change(employeeHistoryKeydownHandler).keydown(employeeHistoryKeydownHandler);
if ($("input#EmployeeName").length > 0)
employeeHistoryIconUpdate($("input#EmployeeName"), $("#icon-employee-history"));
$("#icon-employee-history").qtip({
$("#icon-employee-history").qtip({
content: {
text: "<p class=\"loading\">Recent Logs...</p>",
},
@@ -88,11 +90,11 @@
delay: 500
},
events: {
show: function (event, api) {
show: function(event, api) {
$.ajax({
url: "CreateLog/RecentLogs",
data: {
employeeName: $("input#EmployeeName").val()
employeeName: $("input#EmployeeName").val()
},
success: function(data) {
api.set("content.text", data);
@@ -101,40 +103,39 @@
}
}
});
if ($('input#VehicleId').length > 0) {
// var settings = $('form').validate().settings;
// settings.onkeyup = false;
// settings.onfocusout = function (element) { $(element).valid(); };
// var oldSuccessFunction = settings.success;
// settings.success = function (label) {
// alert("success");
// oldSuccessFunction(label);
// };
}
// Convert MVC3 WebGrid paging to Bootstrap
var $paging = $('table.table tfoot tr td');
var $currentPage =
$paging.contents()
.filter(function () { return this.nodeType == 3 && this.length != 1; });
var $otherPages = $('a', $paging);
if ($paging.length == 1 && $otherPages.length > 0) {
$currentPage.wrap('<li class="active"><a href="#">');
$otherPages.wrap('<li>');
$('li', $paging).wrapAll('<div class="pagination"><ul>');
}
// Add active class to nav
var h = { 'log-nav': /\/log/i, 'vehicle-nav': /\/vehicle/i };
$.each(h, function(id, regex) {
if (regex.test(document.URL)) {
$("#" + id).addClass('active');
}
});
// add qtip
$("a.qtip-modal").each(function () { bindQtipModal($(this)); });
});
function bindQtipModal(element) {
var corner = {
target: 'top left',
tooltip: 'bottom center'
};
var tip = 'bottom left';
if (element.hasClass("below")) {
corner = {
target: 'bottom middle',
tooltip: 'top right'
};
tip = 'top right';
}
element.click(function () { return false; });
element.append('<span class="ui-icon ui-icon-triangle-1-n"/>');
element.append('&nbsp;<i class="icon-chevron-up" />');
element.qtip({
content: {
@@ -147,12 +148,8 @@ function bindQtipModal(element) {
fixed: true,
delay: 500
},
position: {
corner: corner
},
style: {
classes: 'qtip-light',
tip: tip,
classes: 'qtip-light qtip-shadow',
width: 300
}
});
+2025
View File
File diff suppressed because it is too large Load Diff
+6
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+10
View File
@@ -160,5 +160,15 @@ namespace MileageTraker.Web.Utility
var i = 0;
while (true) yield return i++;
}
public static MvcHtmlString Concat(this MvcHtmlString f, MvcHtmlString s)
{
return MvcHtmlString.Create(f.ToString() + s);
}
public static MvcHtmlString Concat(this MvcHtmlString f, string s)
{
return MvcHtmlString.Create(f + s);
}
}
}
@@ -15,9 +15,9 @@ namespace MileageTraker.Web.Utility
{
var today = DateTime.Today;
return today.AddMonths(-1).AddDays(-today.Day + 1); // last two months
if (today.Day > 10)
return today.AddDays(-today.Day); // beginning of this month
return today.AddMonths(-1).AddDays(-today.Day); // beginning of previous month
//if (today.Day > 10)
// return today.AddDays(-today.Day); // beginning of this month
//return today.AddMonths(-1).AddDays(-today.Day); // beginning of previous month
}
}
}
+17
View File
@@ -22,6 +22,23 @@ namespace MileageTraker.Web.Utility
Text = text;
}
}
[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
public class InputSizeAttribute : Attribute
{
public string Size { get; private set; }
public string ClassName { get { return "input-" + Size.ToLower(); } }
/// <summary>
/// Specify width of input element
/// </summary>
/// <param name="size">mini, small, medium, large, xlarge, xxlarge</param>
public InputSizeAttribute(string size)
{
Size = size;
}
}
[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
public class NoEditLabelAttribute : Attribute
+6
View File
@@ -15,6 +15,7 @@ namespace MileageTraker.Web.ViewModels
[Remote("Exists", "Vehicle", ErrorMessage = "ID not found")]
[StringLength(6, MinimumLength = 4, ErrorMessage = "Must be a 4 digit number")]
[Display(Name = "Vehicle ID")]
[InputSize("mini")]
[RegularExpression(@"\d+", ErrorMessage = "Must be all numbers")]
public string VehicleId { get; set; }
@@ -22,6 +23,7 @@ namespace MileageTraker.Web.ViewModels
[Range(1, 500000, ErrorMessage = "Between 1 and 500k")]
[Display(Name = "End Odometer")]
[Units("Miles")]
[InputSize("small")]
[RegularExpression(@"\d+", ErrorMessage = "Must be all numbers")]
public string EndOdometer { get; set; }
@@ -33,10 +35,12 @@ namespace MileageTraker.Web.ViewModels
[Required(ErrorMessage = "Required")]
[Display(Name = "Employee / Driver")]
[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
[InputSize("medium")]
public string EmployeeName { get; set; }
[Required(ErrorMessage = "Required")]
[Display(Name = "City Name")]
[InputSize("medium")]
[StringLength(64, MinimumLength = 3, ErrorMessage = "Minimum 3 characters")]
public string CityName { get; set; }
@@ -45,6 +49,7 @@ namespace MileageTraker.Web.ViewModels
[DisplayFormat(DataFormatString = "{0:0.000}", ApplyFormatInEditMode = true)]
[Units("Gallons")]
[FormatHint("n.nnnn")]
[InputSize("mini")]
public string GasPurchased { get; set; }
[Required(ErrorMessage = "Required")]
@@ -54,6 +59,7 @@ namespace MileageTraker.Web.ViewModels
[DenyFutureDate(ErrorMessage = "Future date")]
[DenyPreviousMonthDate(ErrorMessage = "Previous Month")]
[FormatHint("mm/dd/yyyy")]
[InputSize("small")]
public string Date { get; set; }
static CreateLogViewModel()
+1 -1
View File
@@ -2,13 +2,13 @@
@{
ViewBag.Title = "Confirm";
ViewBag.PageStyle = "~/Content/CreateLog/Index.css";
Layout = "~/Views/Shared/_Layout.cshtml";
var endOdometerStyle = Model.PreviousOdometer != null ? "style=padding-bottom:0px;" : "";
}
@section Styles
{
<link href="@Url.Content("~/Content/VehicleColors.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/CreateLog.Index.css")" rel="stylesheet" type="text/css" />
}
@using (Html.BeginForm("Action", "CreateLog", FormMethod.Post))
+8 -7
View File
@@ -2,12 +2,11 @@
@{
ViewBag.Title = "Enter Mileage Log";
ViewBag.PageStyle = "~/Content/CreateLog.Index.css";
Layout = "~/Views/Shared/_Layout.cshtml";
}
@section Styles
{
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
}
@section Scripts
{
@@ -16,14 +15,16 @@
<script src="@Url.Content("~/Scripts/jquery.qtip.min.js")" type="text/javascript"></script>
}
@using (Html.BeginForm("Index", "CreateLog", FormMethod.Post))
@using (Html.BeginForm("Index", "CreateLog", FormMethod.Post, new { @class = "form-horizontal" }))
{
@:<fieldset>
<fieldset>
<legend>@ViewBag.Title</legend>
@Html.ValidationSummary(true)
@Html.EditorForModel()
<div class="submit">
<input type="submit" value="Submit" />
<div class="control-group">
<div class="controls">
<input type="submit" value="Submit" class="btn btn-primary" />
</div>
</div>
@:</fieldset>
</fieldset>
}
+10 -3
View File
@@ -4,8 +4,8 @@
@if (Model.Any())
{
<h4>Recent Logs for @ViewData["employeeName"]</h4>
<table>
<h5>Recent Logs for @ViewData["employeeName"]</h5>
<table class="table">
<thead>
<tr>
<th>
@@ -43,5 +43,12 @@
}
else
{
<h4>Mileage history not found for for "@ViewData["employeeName"]"</h4>
if (!string.IsNullOrEmpty(ViewData["employeeName"].ToString()))
{
<h5>Mileage history not found for employee "@ViewData["employeeName"]"</h5>
}
else
{
<h5>Please enter employee name</h5>
}
}
+7 -2
View File
@@ -2,9 +2,14 @@
@{
ViewBag.Title = "Success";
ViewBag.PageStyle = "~/Content/CreateLog/Index.css";
Layout = "~/Views/Shared/_Layout.cshtml";
}
@section Styles
{
<link href="@Url.Content("~/Content/CreateLog.Index.css")" rel="stylesheet" type="text/css" />
}
@{
@:<fieldset>
<legend>@ViewBag.Title</legend>
@@ -16,7 +21,7 @@
in VehicleId <strong>@Html.Encode(Model.VehicleId)</strong>
</p>
<p>
@Html.ActionLink("Create another", "Index", null, new { @class = "ui-button" })
@Html.ActionLink("Create another", "Index", null, new { @class = "btn" })
</p>
@:</fieldset>
-8
View File
@@ -1,8 +0,0 @@
@{
ViewBag.Title = "About Us";
}
<h2>About</h2>
<p>
Put content here.
</p>
+15 -8
View File
@@ -3,23 +3,30 @@
@{
ViewBag.Title = "Create Log";
}
@section Styles
{
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
}
@section Scripts
{
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.qtip.min.js")" type="text/javascript"></script>
}
<h2>@ViewBag.Title</h2>
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
<div>
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
</div>
@using (Html.BeginForm()) {
@using (Html.BeginForm("Create", "Log", FormMethod.Post, new { @class = "form-horizontal" })) {
@Html.ValidationSummary(true)
<fieldset>
<legend>Log</legend>
@Html.EditorForModel()
<p>
<input type="submit" value="Create" />
<input type="submit" value="Create" class="btn btn-primary" />
</p>
</fieldset>
}
<p>
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
</p>
+8 -7
View File
@@ -6,14 +6,15 @@
<h2>@ViewBag.Title</h2>
<h3>Are you sure you want to delete this?</h3>
<fieldset>
<legend>Log</legend>
@Html.DisplayForModel()
</fieldset>
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
<h3>Are you sure you wish to delete this log?</h3>
@Html.DisplayForModel()
@using (Html.BeginForm()) {
<p>
<input type="submit" value="Delete" />
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
<input type="submit" value="Delete" class="btn btn-warning" />
@Html.ActionLink("Cancel", "Details", new { id = Model.LogId }, new { @class = "btn" })
</p>
}
+19 -14
View File
@@ -5,19 +5,24 @@
}
<h2>@ViewBag.Title</h2>
<p>
@Html.ActionLink("Previous", "PreviousDetails", new { id = Model.LogId }, new { @class = "ui-button" })
@Html.ActionLink("Next", "NextDetails", new { id = Model.LogId }, new { @class = "ui-button" })
@if(TempData["Message"] != null) {
<span class="ui-message ui-state-highlight ui-corner-all">@TempData["Message"]</span>
}
</p>
<div>
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
@Html.ActionLink("Edit", "Edit", new { id = Model.LogId }, new { @class = "btn" })
@Html.ActionLink("Delete", "Delete", new { id = Model.LogId }, new { @class = "btn" })
</div>
<fieldset>
<legend>Log</legend>
@Html.DisplayForModel()
</fieldset>
<p>
@Html.ActionLink("Edit", "Edit", new { id = Model.LogId }, new { @class = "ui-button" })
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
</p>
<div>
<ul class="pager">
<li class="previous">
@Html.ActionLink("Previous", "PreviousDetails", new { id = Model.LogId })
</li>
@if(TempData["Message"] != null) {
<span class="alert">@TempData["Message"]</span>
}
<li class="next">
@Html.ActionLink("Next", "NextDetails", new { id = Model.LogId })
</li>
</ul>
</div>
+3 -3
View File
@@ -5,6 +5,6 @@
}
<h5>Previous Log</h5>
@Html.DisplayForModel()
<p>
@Html.ActionLink("Details", "Details", new { id = Model.LogId })
</p>
<div>
@Html.ActionLink("Details", "Details", new { id = Model.LogId }, new { @class = "btn"})
</div>
+15 -7
View File
@@ -3,13 +3,25 @@
@{
ViewBag.Title = "Edit Log";
}
@section Styles
{
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
}
@section Scripts
{
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.qtip.min.js")" type="text/javascript"></script>
}
<h2>@ViewBag.Title</h2>
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
<div>
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
</div>
@using (Html.BeginForm()) {
@using (Html.BeginForm("Edit", "Log", FormMethod.Post, new { @class = "form-horizontal" }))
{
@Html.ValidationSummary(true)
<fieldset>
<legend>Log</legend>
@@ -21,7 +33,3 @@
</p>
</fieldset>
}
<p>
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
</p>
+1 -1
View File
@@ -4,5 +4,5 @@
<h2>@ViewBag.Title</h2>
<div>
No logs have been added. @Html.ActionLink("Create Log", "Create", null, new { @class = "ui-button" }).
No logs have been added. @Html.ActionLink("Create Log", "Create", null, new { @class = "btn" }).
</div>
+33 -18
View File
@@ -7,31 +7,40 @@
var grid = new WebGrid(Model.Logs, rowsPerPage: 45);
}
@section Styles {
<link href="@Url.Content("~/Content/VehicleColors.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/VehicleColors.css")" rel="stylesheet" type="text/css" />
}
@section Scripts
{
<script src="@Url.Content("~/Scripts/jquery.qtip.min.js")" type="text/javascript"></script>
}
<h2>@ViewBag.Title</h2>
<h2><img src="/Content/images/glyphicons_026_road.png"/> @ViewBag.Title</h2>
<p>
@using (Html.BeginForm("Index", "Log", FormMethod.Get, new { id = "filter" }))
<div class="btn-toolbar">
@using (Html.BeginForm("Index", "Log", FormMethod.Get, new { id = "filter", @class = "form-inline" }))
{
@Html.EditorForModel()
<input type="submit" value="Filter" />
<div class="input-append pull-right">
@Html.EditorForModel()
<input type="submit" value="Filter" class="btn" />
</div>
}
</p>
<p>
<div id="newLog">
@Html.ActionLink("Vehicle Mileage", "MonthlyVehicleMileage", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType }, new { @class = "ui-button" })
@Html.ActionLink("Employee Mileage", "MonthlyEmployeeMileage", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType }, new { @class = "ui-button" })
@Html.ActionLink("Add New Log", "Create", null, new { @class = "ui-button" })
@Html.ActionLink("Export", "Export", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType }, new { @class = "ui-button" })
@Html.ActionLink("Add New Log", "Create", null, new { @class = "btn" })
@Html.ActionLink("Export", "Export", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType }, new { @class = "btn" })
<div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Report <span class="caret"></span></a>
<ul class="dropdown-menu">
<li>
@Html.ActionLink("Vehicle Mileage", "MonthlyVehicleMileage", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType })
</li>
<li>
@Html.ActionLink("Employee Mileage", "MonthlyEmployeeMileage", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType })
</li>
</ul>
</div>
</p>
</div>
<div>
@grid.GetHtml(columns:
@@ -52,9 +61,15 @@
grid.Column("Date", format: item => item.Date.ToString("d")),
grid.Column("CityName", "City Name"),
grid.Column("EmployeeName", "Employee Name"),
grid.Column(format: item => Html.ActionLink("Edit", "Edit", new { id = item.LogId })),
grid.Column(format: item => Html.ActionLink("Details", "Details", new { id = item.LogId })),
grid.Column(format: item => Html.ActionLink("Delete", "Delete", new { id = item.LogId }))
)
grid.Column(format: item =>
(new MvcHtmlString("<div class='btn-group'>"))
.Concat(Html.ActionLink("Edit", "Edit", new { id = item.LogId }, new { @class = "btn btn-mini" }))
.Concat(Html.ActionLink("Details", "Details", new { id = item.LogId }, new { @class = "btn btn-mini" }))
.Concat(Html.ActionLink("Delete", "Delete", new { id = item.LogId }, new { @class = "btn btn-mini" }))
.Concat("</div>")
)
),
htmlAttributes: new { @class = "table table-striped table-bordered table-hover table-condensed"},
numericLinksCount: 20
)
</div>
+1 -1
View File
@@ -3,7 +3,7 @@
@model IEnumerable<Tuple<Log, Log>>
<div class="report-calculation">
<table>
<table class="table">
<thead><tr><th>Date</th><th>City</th><th>End ODO</th><th>Start ODO</th><th>Miles</th></tr></thead>
@foreach (var log in Model)
{
+3 -3
View File
@@ -12,8 +12,8 @@
<h2>@ViewBag.Title</h2>
<p class="no-print">
@Html.ActionLink("Logs", "Index", "Log", Model.Query, new { @class = "ui-button" })
<p class="no-print btn-group">
@Html.ActionLink("Logs", "Index", "Log", Model.Query, new { @class = "btn" })
</p>
@Html.DisplayFor(m => m.Query.Year)
@Html.DisplayFor(m => m.Query.Month)
@@ -21,7 +21,7 @@
{
@Html.DisplayFor(m => m.Query.LogType)
}
<table>
<table class="table">
<tr>
<th>
Employee
+3 -3
View File
@@ -13,8 +13,8 @@
<h2>@ViewBag.Title</h2>
<p class="no-print">
@Html.ActionLink("Logs", "Index", "Log", Model.Query, new { @class = "ui-button" })
<p class="no-print btn-group">
@Html.ActionLink("Logs", "Index", "Log", Model.Query, new { @class = "btn" })
</p>
@Html.DisplayFor(m => m.Query.Year)
@Html.DisplayFor(m => m.Query.Month)
@@ -22,7 +22,7 @@
{
@Html.DisplayFor(m => m.Query.LogType)
}
<table>
<table class="table">
<tr>
<th>
Vehicle Id
@@ -6,15 +6,15 @@
var color = ViewData.ModelMetadata.PropertyName == "Color" ? Model : "";
}
<div class="display-field-container @lowerPropertyName">
<div class="display-label">
@Html.LabelForModel()
</div>
<div class="display-field @color">
<dl class="dl-horizontal @lowerPropertyName">
<dt>
@Html.ViewData.ModelMetadata.DisplayName
</dt>
<dd @(!string.IsNullOrEmpty(color) ? "class='" + color + "'" : "") >
@RenderBody()
@if (!string.IsNullOrEmpty(units))
{
<span class="units">@units</span>
<small><em>@units</em></small>
}
</div>
</div>
</dd>
</dl>
@@ -1,4 +1,12 @@
@{
Layout = "~/Views/Shared/EditorTemplates/_FieldLayout.cshtml";
var inputSize = (string)ViewData.ModelMetadata.AdditionalValues["InputSize"];
}
@Html.TextBox("", ViewData.TemplateInfo.FormattedModelValue)
@if (!string.IsNullOrEmpty(inputSize))
{
@Html.TextBox("", ViewData.TemplateInfo.FormattedModelValue, new { @class = inputSize})
}
else
{
@Html.TextBox("", ViewData.TemplateInfo.FormattedModelValue)
}
+4 -4
View File
@@ -9,10 +9,10 @@
foreach (var li in listItems)
{
var fieldName = string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}_{1}", prefix.Replace('.', '_'), index++);
<span class="radiobutton">
@Html.RadioButton(prefix, li.Value, li.Selected, new { @id = fieldName })
@Html.Label(fieldName, li.Text)
</span>
<label class="radio">
@Html.RadioButton(prefix, li.Value, li.Selected, new { @id = fieldName })
@li.Text
</label>
}
ViewData.TemplateInfo.HtmlFieldPrefix = prefix;
}
@@ -2,6 +2,6 @@
@using MileageTraker.Web.Utility
@model MileageTraker.Web.ViewModels.LogResultsViewModel
@Html.DropDownList("Year", new SelectList(Model.Years, Model.SelectedYear))
@Html.DropDownList("Month", new SelectList(Model.Months, Model.SelectedMonth))
@Html.DropDownList("LogType", typeof(MileageLogType).ToSelectList(Model.SelectedLogType, "Log Type"))
@Html.DropDownList("Year", new SelectList(Model.Years, Model.SelectedYear), new { @class = "input-small" })
@Html.DropDownList("Month", new SelectList(Model.Months, Model.SelectedMonth), new { @class = "input-mini" })
@Html.DropDownList("LogType", typeof(MileageLogType).ToSelectList(Model.SelectedLogType, "Log Type"), new { @class = "input-medium" })
@@ -1,9 +1,17 @@
@{
Layout = "~/Views/Shared/EditorTemplates/_FieldLayout.cshtml";
var inputSize = (string)ViewData.ModelMetadata.AdditionalValues["InputSize"];
}
@if (!(Model is Enum))
{
@Html.TextBox("", ViewData.TemplateInfo.FormattedModelValue)
if (!string.IsNullOrEmpty(inputSize))
{
@Html.TextBox("", ViewData.TemplateInfo.FormattedModelValue, new { @class = inputSize})
}
else
{
@Html.TextBox("", ViewData.TemplateInfo.FormattedModelValue)
}
}
else
{
@@ -7,20 +7,27 @@
var editLabel = (bool)ViewData.ModelMetadata.AdditionalValues["EditLabel"];
}
<div class="editor-field-container @lowerPropertyName">
<div class="control-group @lowerPropertyName">
@if (editLabel) {
<div class="editor-label">
<div class="control-label">
@Html.LabelForModel()
</div>
}
<div class="editor-field">
@RenderBody()
@if (!string.IsNullOrEmpty(units)) {
<span class="units">@units</span>
}
<div class="controls">
@if (!string.IsNullOrEmpty(units))
{
<div class="input-append">
@RenderBody()
<span class="add-on">@units</span>
</div>
}
else
{
@RenderBody()
}
@if (!string.IsNullOrEmpty(formatHint)) {
<div class="format-hint">@formatHint</div>
<div><small><em>@formatHint</em></small></div>
}
@Html.ValidationMessage("")
<span class="help-inline">@Html.ValidationMessage("")</span>
</div>
</div>
+17 -18
View File
@@ -2,34 +2,33 @@
<html>
<head>
<title>Mileage Traker - ETHRA - @ViewBag.Title</title>
<link href="@Url.Content("~/Content/Site.admin.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/themes/custom-theme/jquery-ui-1.9.2.custom.min.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/bootstrap.min.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/Site.admin.css")" rel="stylesheet" type="text/css" />
@RenderSection("Styles", false)
</head>
<body>
<div class="page">
<div id="header">
<div id="title">
<a href="/"><img src="/Content/images/Header.png" alt="Mileage Traker - ETHRA" width="452" height="89" /></a>
</div>
<div id="menucontainer">
<ul id="menu">
<li>
@Html.ActionLink("Logs", "Index", "Log")</li>
<li>
@Html.ActionLink("Vehicles", "Index", "Vehicle")</li>
<header>
<div class="navbar navbar-fixed-top navbar-inverse">
<div class="navbar-inner">
<span class="brand" ></span>
<ul class="nav">
<li id="log-nav">@Html.ActionLink("Logs", "Index", "Log")</li>
<li id="vehicle-nav">@Html.ActionLink("Vehicles", "Index", "Vehicle")</li>
<li>@Html.ActionLink("Enter Mileage Log", "Index", "CreateLog")</li>
</ul>
</div>
</div>
<div id="main">
@RenderBody()
</div>
<div id="footer">
Mileage Traker &copy; 2012 James Kolpack
</div>
</header>
<div id="content">
@RenderBody()
</div>
<footer>
Mileage Traker &copy; 2012 James Kolpack
</footer>
<script src="@Url.Content("~/Scripts/jquery-1.8.3.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/bootstrap.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery-ui-1.9.2.custom.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.numeric.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/Shared/Site.js")" type="text/javascript"></script>
+14 -8
View File
@@ -3,22 +3,28 @@
<head>
<title>Mileage Traker - ETHRA - @ViewBag.Title</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/themes/custom-theme/jquery-ui-1.9.2.custom.min.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/bootstrap.min.css")" rel="stylesheet" type="text/css" />
<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
@RenderSection("Styles", false)
@if (ViewBag.PageStyle != null)
{
<link href="@Url.Content(ViewBag.PageStyle)" rel="stylesheet" type="text/css" />
}
</head>
<body>
<div id="header">
<img src="@Url.Content("~/Content/images/Header_white.png")" alt="Mileage Traker" />
<header>
<div class="navbar navbar-fixed-top navbar-inverse">
<div class="navbar-inner">
<span class="brand" ></span>
</div>
</div>
</header>
<div id="content">
@RenderBody()
</div>
@RenderBody()
<script src="@Url.Content("~/Scripts/jquery-1.8.3.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/bootstrap.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.numeric.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery-ui-1.9.2.custom.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/Shared/Site.js")" type="text/javascript"></script>
+16 -10
View File
@@ -3,24 +3,30 @@
@{
ViewBag.Title = "Create Vehicle";
}
@section Styles
{
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
}
@section Scripts
{
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.qtip.min.js")" type="text/javascript"></script>
}
<h2>@ViewBag.Title</h2>
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
<div class="btn-toolbar">
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
</div>
@using (Html.BeginForm()) {
@using (Html.BeginForm("Create", "Vehicle", FormMethod.Post, new { @class = "form-horizontal" }))
{
@Html.ValidationSummary(true)
<fieldset>
<legend>Vehicle</legend>
@Html.EditorForModel()
<p>
<input type="submit" value="Create" />
</p>
<input type="submit" value="Create" class="btn btn-primary" />
</fieldset>
}
<p>
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
</p>
+6 -8
View File
@@ -10,11 +10,9 @@
<h2>@ViewBag.Title</h2>
<fieldset>
<legend>Vehicle</legend>
@Html.DisplayForModel()
</fieldset>
<p>
@Html.ActionLink("Edit", "Edit", new { id = Model.VehicleId }, new { @class = "ui-button" })
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
</p>
<div class="btn-toolbar">
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
@Html.ActionLink("Edit", "Edit", new { id = Model.VehicleId }, new { @class = "btn" })
</div>
@Html.DisplayForModel()
+4 -3
View File
@@ -2,7 +2,8 @@
@{
Layout = null;
}
<h5>Vehicle</h5>
@Html.DisplayForModel()
<p>
@Html.ActionLink("Details", "Details", new { id = Model.VehicleId })
</p>
<div>
@Html.ActionLink("Details", "Details", new { id = Model.VehicleId }, new { @class = "btn"})
</div>
+16 -10
View File
@@ -3,24 +3,30 @@
@{
ViewBag.Title = "Edit Vehicle";
}
@section Styles
{
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
}
@section Scripts
{
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.qtip.min.js")" type="text/javascript"></script>
}
<h2>@ViewBag.Title</h2>
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
<div class="btn-toolbar">
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
</div>
@using (Html.BeginForm()) {
@using (Html.BeginForm("Edit", "Vehicle", FormMethod.Post, new { @class = "form-horizontal" }))
{
@Html.ValidationSummary(true)
<fieldset>
<legend>Vehicle</legend>
@Html.EditorForModel()
<p>
<input type="submit" value="Save" />
</p>
<input type="submit" value="Save" class="btn btn-primary" />
</fieldset>
}
<p>
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
</p>
+16 -13
View File
@@ -1,4 +1,5 @@
@model IEnumerable<MileageTraker.Web.Models.Vehicle>
@using MileageTraker.Web.Utility
@model IEnumerable<MileageTraker.Web.Models.Vehicle>
@{
ViewBag.Title = "Vehicles";
@@ -8,13 +9,13 @@
<link href="@Url.Content("~/Content/VehicleColors.css")" rel="stylesheet" type="text/css" />
}
<h2>@ViewBag.Title</h2>
<h2><img src="/Content/images/glyphicons_005_car.png"/> @ViewBag.Title</h2>
<p>
@Html.ActionLink("Add another vehicle", "Create", null, new{@class="ui-button"})
@Html.ActionLink("Export", "Export", null, new { @class = "ui-button" })
</p>
<table>
<div class="btn-toolbar">
@Html.ActionLink("Add another vehicle", "Create", null, new{@class="btn"})
@Html.ActionLink("Export", "Export", null, new { @class = "btn" })
</div>
<table class="table table-striped table-bordered table-hover table-condensed">
<tr>
<th>
Key
@@ -46,7 +47,7 @@
<th>
ODO
</th>
<th></th><th></th><th></th>
<th></th>
</tr>
@foreach (var item in Model) {
@@ -77,17 +78,19 @@
</td>
<td>
@Html.DisplayTextFor(m => item.Assigned) @if(!string.IsNullOrEmpty(item.Notes)) {
<span class="format-hint">@Html.DisplayTextFor(m => item.Notes)</span>
<small class="muted"><em>@Html.DisplayTextFor(m => item.Notes)</em></small>
}
</td>
<td>
@Html.DisplayTextFor(m => item.CurrentOdometer)
</td>
<td>
@Html.ActionLink("Edit", "Edit", new { id=item.VehicleId }) </td>
<td> @Html.ActionLink("Details", "Details", new { id=item.VehicleId }) </td>
<td> @Html.ActionLink("New log", "Create", "Log", new { vehicleId = item.VehicleId }, null)
</td>
@(new MvcHtmlString("<div class='btn-group'>")
.Concat(Html.ActionLink("Edit", "Edit", new { id = item.VehicleId }, new { @class = "btn btn-mini" }))
.Concat(Html.ActionLink("Details", "Details", new { id = item.VehicleId }, new { @class = "btn btn-mini" }))
//.Concat(Html.ActionLink("New log", "Create", new { id = item.VehicleId }, new { @class = "btn btn-mini" }))
.Concat("</div>"))
</td>
</tr>
}
+29 -18
View File
@@ -133,29 +133,39 @@
<Compile Include="ViewModels\LogResultsViewModel.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\bootstrap-responsive.css" />
<Content Include="Content\bootstrap-responsive.min.css" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\images\Background.png" />
<Content Include="Content\CreateLog.Index.css" />
<Content Include="Content\images\glyphicons-halflings-white.png" />
<Content Include="Content\images\glyphicons-halflings.png" />
<Content Include="Content\images\glyphicons_005_car.png" />
<Content Include="Content\images\glyphicons_026_road.png" />
<Content Include="Content\images\Header.png" />
<Content Include="Content\images\Header_white.png" />
<Content Include="Content\jquery.qtip.min.css" />
<Content Include="Content\images\Rainbow.png" />
<Content Include="Content\Site.admin.css" />
<None Include="Content\Site.admin.css.old" />
<Content Include="Content\images\spinner.gif" />
<Content Include="Content\themes\custom-theme\images\ui-bg_diagonals-thick_18_b81900_40x40.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_diagonals-thick_20_666666_40x40.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_flat_10_000000_40x100.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_glass_100_f0f0f0_1x400.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_glass_100_f6f6f6_1x400.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_glass_65_ffffff_1x400.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_gloss-wave_35_d0d9c2_500x100.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_highlight-soft_100_eeeeee_1x100.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_highlight-soft_75_ffe45c_1x100.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_000000_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_222222_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_228ef1_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_ef8c08_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_ffd27a_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_ffffff_256x240.png" />
<Content Include="Content\Site.admin.css" />
<Content Include="Content\Site.css" />
<Content Include="Content\themes\custom-theme\images\ui-bg_flat_0_aaaaaa_40x100.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_flat_55_fbec88_40x100.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_glass_75_d0e5f5_1x400.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_glass_85_dfeffc_1x400.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_glass_95_fef1ec_1x400.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_gloss-wave_55_5c9ccc_500x100.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_inset-hard_100_f5f8f9_1x100.png" />
<Content Include="Content\themes\custom-theme\images\ui-bg_inset-hard_100_fcfdfd_1x100.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_217bc0_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_2e83ff_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_469bdd_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_6da8d5_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_cd0a0a_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_d8e7f3_256x240.png" />
<Content Include="Content\themes\custom-theme\images\ui-icons_f9bd01_256x240.png" />
<Content Include="Content\themes\custom-theme\jquery-ui-1.9.2.custom.css" />
<Content Include="Content\themes\custom-theme\jquery-ui-1.9.2.custom.min.css" />
<Content Include="Content\VehicleColors.css" />
@@ -163,6 +173,8 @@
<Content Include="Global.asax" />
<Content Include="README.jQuery.vsdoc.txt" />
<None Include="Scripts\jquery-1.8.3.intellisense.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Scripts\jquery-1.8.3.js" />
<Content Include="Scripts\jquery-1.8.3.min.js" />
<Content Include="Scripts\jquery-ui-1.9.2.custom.min.js" />
@@ -183,13 +195,12 @@
<Content Include="Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
<Content Include="Content\Site.css" />
<None Include="Content\Site.css.old" />
<Content Include="Scripts\jquery.unobtrusive-ajax.js" />
<Content Include="Scripts\jquery.unobtrusive-ajax.min.js" />
<Content Include="Scripts\jquery.validate.unobtrusive.js" />
<Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
<Content Include="Views\_ViewStart.cshtml" />
<Content Include="Views\Home\About.cshtml" />
<Content Include="Views\Shared\Error.cshtml" />
<Content Include="Views\Shared\_Layout.admin.cshtml" />
<Content Include="Views\Web.config" />
+1
View File
@@ -9,4 +9,5 @@
<package id="log4net" version="2.0.0" />
<package id="Modernizr" version="2.6.2" targetFramework="net40" />
<package id="morelinq" version="1.0" />
<package id="Twitter.Bootstrap" version="2.2.1" targetFramework="net40" />
</packages>